diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ce0851b2b5681..789d4ff6ceb02 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1583,7 +1583,7 @@ module ts {
             var writeComment = writeCommentRange;
 
             /** Emit a node */
-            var emit = emitNode;
+            var emitJavascript = emitJavaScriptWorker;
 
             /** Called just before starting emit of a node */
             var emitStart = function (node: Node) { };
@@ -1615,12 +1615,12 @@ module ts {
             }
 
             if (root) {
-                emit(root);
+                emitNode(root);
             }
             else {
                 forEach(host.getSourceFiles(), sourceFile => {
                     if (!isExternalModuleOrDeclarationFile(sourceFile)) {
-                        emit(sourceFile);
+                        emitNode(sourceFile);
                     }
                 });
             }
@@ -1957,22 +1957,22 @@ module ts {
                     sourceMapDir = getDirectoryPath(normalizePath(jsFilePath));
                 }
 
-                function emitNodeWithMap(node: Node) {
+                function emitJavascriptWithMap(node: Node) {
                     if (node) {
                         if (node.kind != SyntaxKind.SourceFile) {
                             recordEmitNodeStartSpan(node);
-                            emitNode(node);
+                            emitJavaScriptWorker(node);
                             recordEmitNodeEndSpan(node);
                         }
                         else {
                             recordNewSourceFileStart(<SourceFile>node);
-                            emitNode(node);
+                            emitJavaScriptWorker(node);
                         }
                     }
                 }
 
                 writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithMap;
+                emitJavascript = emitJavascriptWithMap;
                 emitStart = recordEmitNodeStartSpan;
                 emitEnd = recordEmitNodeEndSpan;
                 emitToken = writeTextWithSpanRecord;
@@ -2037,7 +2037,7 @@ module ts {
             function emitOptional(prefix: string, node: Node) {
                 if (node) {
                     write(prefix);
-                    emit(node);
+                    emitNode(node);
                 }
             }
 
@@ -2045,7 +2045,7 @@ module ts {
                 if (parenthesized) {
                     write("(");
                 }
-                emit(node);
+                emitNode(node);
                 if (parenthesized) {
                     write(")");
                 }
@@ -2073,7 +2073,7 @@ module ts {
                             write(", ");
                         }
                     }
-                    emit(nodes[start + i]);
+                    emitNode(nodes[start + i]);
                 }
                 if (trailingComma) {
                     write(",");
@@ -2103,7 +2103,7 @@ module ts {
             function emitLinesStartingAt(nodes: Node[], startIndex: number): void {
                 for (var i = startIndex; i < nodes.length; i++) {
                     writeLine();
-                    emit(nodes[i]);
+                    emitNode(nodes[i]);
                 }
             }
 
@@ -2143,7 +2143,7 @@ module ts {
                 // In ES6 mode and above, we can simply emit each portion of a template in order, but in
                 // ES3 & ES5 we must convert the template expression into a series of string concatenations.
                 if (languageVersion >= ScriptTarget.ES6) {
-                    forEachChild(node, emit);
+                    forEachChild(node, emitNode);
                     return;
                 }
 
@@ -2268,8 +2268,8 @@ module ts {
             }
 
             function emitTemplateSpan(span: TemplateSpan) {
-                emit(span.expression);
-                emit(span.literal);
+                emitNode(span.expression);
+                emitNode(span.literal);
             }
 
             // This function specifically handles numeric/string literals for enum and accessor 'identifiers'.
@@ -2279,7 +2279,7 @@ module ts {
                     emitLiteral(<LiteralExpression>node);
                 }
                 else if (node.kind === SyntaxKind.ComputedPropertyName) {
-                    emit((<ComputedPropertyName>node).expression);
+                    emitNode((<ComputedPropertyName>node).expression);
                 }
                 else {
                     write("\"");
@@ -2388,14 +2388,14 @@ module ts {
 
             function emitBindingElement(node: BindingElement) {
                 if (node.propertyName) {
-                    emit(node.propertyName);
+                    emitNode(node.propertyName);
                     write(": ");
                 }
                 if (node.dotDotDotToken) {
                     write("...");
                 }
                 if (isBindingPattern(node.name)) {
-                    emit(node.name);
+                    emitNode(node.name);
                 }
                 else {
                     emitModuleMemberName(node);
@@ -2405,7 +2405,7 @@ module ts {
 
             function emitSpreadElementExpression(node: SpreadElementExpression) {
                 write("...");
-                emit((<SpreadElementExpression>node).expression);
+                emitNode((<SpreadElementExpression>node).expression);
             }
 
             function needsParenthesisForPropertyAccess(node: Expression) {
@@ -2494,12 +2494,12 @@ module ts {
 
             function emitComputedPropertyName(node: ComputedPropertyName) {
                 write("[");
-                emit(node.expression);
+                emitNode(node.expression);
                 write("]");
             }
 
             function emitMethod(node: MethodDeclaration) {
-                emit(node.name);
+                emitNode(node.name);
                 if (languageVersion < ScriptTarget.ES6) {
                     write(": function ");
                 }
@@ -2507,13 +2507,13 @@ module ts {
             }
 
             function emitPropertyAssignment(node: PropertyDeclaration) {
-                emit(node.name);
+                emitNode(node.name);
                 write(": ");
-                emit(node.initializer);
+                emitNode(node.initializer);
             }
 
             function emitShorthandPropertyAssignment(node: ShorthandPropertyAssignment) {
-                emit(node.name);
+                emitNode(node.name);
                 // If short-hand property has a prefix, then regardless of the target version, we will emit it as normal property assignment. For example:
                 //  module m {
                 //      export var y;
@@ -2548,24 +2548,24 @@ module ts {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
-                emit(node.expression);
+                emitNode(node.expression);
                 write(".");
-                emit(node.name);
+                emitNode(node.name);
             }
 
             function emitQualifiedName(node: QualifiedName) {
-                emit(node.left);
+                emitNode(node.left);
                 write(".");
-                emit(node.right);
+                emitNode(node.right);
             }
 
             function emitIndexedAccess(node: ElementAccessExpression) {
                 if (tryEmitConstantValue(node)) {
                     return;
                 }
-                emit(node.expression);
+                emitNode(node.expression);
                 write("[");
-                emit(node.argumentExpression);
+                emitNode(node.argumentExpression);
                 write("]");
             }
 
@@ -2582,15 +2582,15 @@ module ts {
 
             function emitCallTarget(node: Expression): Expression {
                 if (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.ThisKeyword || node.kind === SyntaxKind.SuperKeyword) {
-                    emit(node);
+                    emitNode(node);
                     return node;
                 }
                 var temp = createTempVariable(node);
                 recordTempDeclaration(temp);
                 write("(");
-                emit(temp);
+                emitNode(temp);
                 write(" = ");
-                emit(node);
+                emitNode(node);
                 write(")");
                 return temp;
             }
@@ -2602,13 +2602,13 @@ module ts {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget((<PropertyAccessExpression>expr).expression);
                     write(".");
-                    emit((<PropertyAccessExpression>expr).name);
+                    emitNode((<PropertyAccessExpression>expr).name);
                 }
                 else if (expr.kind === SyntaxKind.ElementAccessExpression) {
                     // Target will be emitted as "this" argument
                     target = emitCallTarget((<PropertyAccessExpression>expr).expression);
                     write("[");
-                    emit((<ElementAccessExpression>expr).argumentExpression);
+                    emitNode((<ElementAccessExpression>expr).argumentExpression);
                     write("]");
                 }
                 else if (expr.kind === SyntaxKind.SuperKeyword) {
@@ -2616,7 +2616,7 @@ module ts {
                     write("_super");
                 }
                 else {
-                    emit(node.expression);
+                    emitNode(node.expression);
                 }
                 write(".apply(");
                 if (target) {
@@ -2626,7 +2626,7 @@ module ts {
                     }
                     else {
                         // Calls of form obj.foo(...)
-                        emit(target);
+                        emitNode(target);
                     }
                 }
                 else {
@@ -2649,7 +2649,7 @@ module ts {
                     superCall = true;
                 }
                 else {
-                    emit(node.expression);
+                    emitNode(node.expression);
                     superCall = node.expression.kind === SyntaxKind.PropertyAccessExpression && (<PropertyAccessExpression>node.expression).expression.kind === SyntaxKind.SuperKeyword;
                 }
                 if (superCall) {
@@ -2670,7 +2670,7 @@ module ts {
 
             function emitNewExpression(node: NewExpression) {
                 write("new ");
-                emit(node.expression);
+                emitNode(node.expression);
                 if (node.arguments) {
                     write("(");
                     emitCommaList(node.arguments);
@@ -2679,9 +2679,9 @@ module ts {
             }
 
             function emitTaggedTemplateExpression(node: TaggedTemplateExpression): void {
-                emit(node.tag);
+                emitNode(node.tag);
                 write(" ");
-                emit(node.template);
+                emitNode(node.template);
             }
 
             function emitParenExpression(node: ParenthesizedExpression) {
@@ -2710,31 +2710,31 @@ module ts {
                         operand.kind !== SyntaxKind.NewExpression &&
                         !(operand.kind === SyntaxKind.CallExpression && node.parent.kind === SyntaxKind.NewExpression) &&
                         !(operand.kind === SyntaxKind.FunctionExpression && node.parent.kind === SyntaxKind.CallExpression)) {
-                        emit(operand);
+                        emitNode(operand);
                         return;
                     }
                 }
                 write("(");
-                emit(node.expression);
+                emitNode(node.expression);
                 write(")");
             }
 
             function emitDeleteExpression(node: DeleteExpression) {
                 write(tokenToString(SyntaxKind.DeleteKeyword));
                 write(" ");
-                emit(node.expression);
+                emitNode(node.expression);
             }
 
             function emitVoidExpression(node: VoidExpression) {
                 write(tokenToString(SyntaxKind.VoidKeyword));
                 write(" ");
-                emit(node.expression);
+                emitNode(node.expression);
             }
 
             function emitTypeOfExpression(node: TypeOfExpression) {
                 write(tokenToString(SyntaxKind.TypeOfKeyword));
                 write(" ");
-                emit(node.expression);
+                emitNode(node.expression);
             }
 
             function emitPrefixUnaryExpression(node: PrefixUnaryExpression) {
@@ -2760,11 +2760,11 @@ module ts {
                         write(" ");
                     }
                 }
-                emit(node.operand);
+                emitNode(node.operand);
             }
 
             function emitPostfixUnaryExpression(node: PostfixUnaryExpression) {
-                emit(node.operand);
+                emitNode(node.operand);
                 write(tokenToString(node.operator));
             }
 
@@ -2774,20 +2774,20 @@ module ts {
                     emitDestructuring(node);
                 }
                 else {
-                    emit(node.left);
+                    emitNode(node.left);
                     if (node.operator !== SyntaxKind.CommaToken) write(" ");
                     write(tokenToString(node.operator));
                     write(" ");
-                    emit(node.right);
+                    emitNode(node.right);
                 }
             }
 
             function emitConditionalExpression(node: ConditionalExpression) {
-                emit(node.condition);
+                emitNode(node.condition);
                 write(" ? ");
-                emit(node.whenTrue);
+                emitNode(node.whenTrue);
                 write(" : ");
-                emit(node.whenFalse);
+                emitNode(node.whenFalse);
             }
 
             function isSingleLineBlock(node: Node) {
@@ -2825,12 +2825,12 @@ module ts {
             function emitEmbeddedStatement(node: Node) {
                 if (node.kind === SyntaxKind.Block) {
                     write(" ");
-                    emit(<Block>node);
+                    emitNode(<Block>node);
                 }
                 else {
                     increaseIndent();
                     writeLine();
-                    emit(node);
+                    emitNode(node);
                     decreaseIndent();
                 }
             }
@@ -2844,7 +2844,7 @@ module ts {
                 var endPos = emitToken(SyntaxKind.IfKeyword, node.pos);
                 write(" ");
                 endPos = emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.expression);
+                emitNode(node.expression);
                 emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 emitEmbeddedStatement(node.thenStatement);
                 if (node.elseStatement) {
@@ -2852,7 +2852,7 @@ module ts {
                     emitToken(SyntaxKind.ElseKeyword, node.thenStatement.end);
                     if (node.elseStatement.kind === SyntaxKind.IfStatement) {
                         write(" ");
-                        emit(node.elseStatement);
+                        emitNode(node.elseStatement);
                     }
                     else {
                         emitEmbeddedStatement(node.elseStatement);
@@ -2870,13 +2870,13 @@ module ts {
                     writeLine();
                 }
                 write("while (");
-                emit(node.expression);
+                emitNode(node.expression);
                 write(");");
             }
 
             function emitWhileStatement(node: WhileStatement) {
                 write("while (");
-                emit(node.expression);
+                emitNode(node.expression);
                 write(")");
                 emitEmbeddedStatement(node.statement);
             }
@@ -2901,7 +2901,7 @@ module ts {
                     emitCommaList(variableDeclarationList.declarations);
                 }
                 else if (node.initializer) {
-                    emit(node.initializer);
+                    emitNode(node.initializer);
                 }
                 write(";");
                 emitOptional(" ", node.condition);
@@ -2926,14 +2926,14 @@ module ts {
                             emitToken(SyntaxKind.VarKeyword, endPos);
                         }
                         write(" ");
-                        emit(decl);
+                        emitNode(decl);
                     }
                 }
                 else {
-                    emit(node.initializer);
+                    emitNode(node.initializer);
                 }
                 write(" in ");
-                emit(node.expression);
+                emitNode(node.expression);
                 emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 emitEmbeddedStatement(node.statement);
             }
@@ -2952,7 +2952,7 @@ module ts {
 
             function emitWithStatement(node: WhileStatement) {
                 write("with (");
-                emit(node.expression);
+                emitNode(node.expression);
                 write(")");
                 emitEmbeddedStatement(node.statement);
             }
@@ -2961,7 +2961,7 @@ module ts {
                 var endPos = emitToken(SyntaxKind.SwitchKeyword, node.pos);
                 write(" ");
                 emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.expression);
+                emitNode(node.expression);
                 endPos = emitToken(SyntaxKind.CloseParenToken, node.expression.end);
                 write(" ");
                 emitToken(SyntaxKind.OpenBraceToken, endPos);
@@ -2985,7 +2985,7 @@ module ts {
             function emitCaseOrDefaultClause(node: CaseOrDefaultClause) {
                 if (node.kind === SyntaxKind.CaseClause) {
                     write("case ");
-                    emit((<CaseClause>node).expression);
+                    emitNode((<CaseClause>node).expression);
                     write(":");
                 }
                 else {
@@ -2993,7 +2993,7 @@ module ts {
                 }
                 if (node.statements.length === 1 && isOnSameLine(node, node.statements[0])) {
                     write(" ");
-                    emit(node.statements[0]);
+                    emitNode(node.statements[0]);
                 }
                 else {
                     increaseIndent();
@@ -3004,18 +3004,18 @@ module ts {
 
             function emitThrowStatement(node: ThrowStatement) {
                 write("throw ");
-                emit(node.expression);
+                emitNode(node.expression);
                 write(";");
             }
 
             function emitTryStatement(node: TryStatement) {
                 write("try ");
-                emit(node.tryBlock);
-                emit(node.catchClause);
+                emitNode(node.tryBlock);
+                emitNode(node.catchClause);
                 if (node.finallyBlock) {
                     writeLine();
                     write("finally ");
-                    emit(node.finallyBlock);
+                    emitNode(node.finallyBlock);
                 }
             }
 
@@ -3024,7 +3024,7 @@ module ts {
                 var endPos = emitToken(SyntaxKind.CatchKeyword, node.pos);
                 write(" ");
                 emitToken(SyntaxKind.OpenParenToken, endPos);
-                emit(node.name);
+                emitNode(node.name);
                 emitToken(SyntaxKind.CloseParenToken, node.name.end);
                 write(" ");
                 emitBlock(node.block);
@@ -3036,9 +3036,9 @@ module ts {
             }
 
             function emitLabelledStatement(node: LabeledStatement) {
-                emit(node.label);
+                emitNode(node.label);
                 write(": ");
-                emit(node.statement);
+                emitNode(node.statement);
             }
 
             function getContainingModule(node: Node): ModuleDeclaration {
@@ -3049,14 +3049,16 @@ module ts {
             }
 
             function emitModuleMemberName(node: Declaration) {
+                emitLeadingComments(node.name);
                 emitStart(node.name);
                 if (getCombinedNodeFlags(node) & NodeFlags.Export) {
                     var container = getContainingModule(node);
                     write(container ? resolver.getLocalNameOfContainer(container) : "exports");
                     write(".");
                 }
-                emitNode(node.name);
+                emitJavaScriptWorker(node.name);
                 emitEnd(node.name);
+                emitTrailingComments(node.name);
             }
 
             function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration, value?: Expression) {
@@ -3079,10 +3081,10 @@ module ts {
                         emitModuleMemberName(<Declaration>name.parent);
                     }
                     else {
-                        emit(name);
+                        emitNode(name);
                     }
                     write(" = ");
-                    emit(value);
+                    emitNode(value);
                 }
 
                 function ensureIdentifier(expr: Expression): Expression {
@@ -3223,7 +3225,7 @@ module ts {
                         value = ensureIdentifier(value);
                         emitDestructuringAssignment(target, value);
                         write(", ");
-                        emit(value);
+                        emitNode(value);
                         if (root.parent.kind !== SyntaxKind.ParenthesizedExpression) {
                             write(")");
                         }
@@ -3281,7 +3283,7 @@ module ts {
                         emitDestructuring(node);
                     }
                     else {
-                        emit(node.name);
+                        emitNode(node.name);
                         emitOptional(" = ", node.initializer);
                     }
                 }
@@ -3315,17 +3317,17 @@ module ts {
                             tempParameters = [];
                         }
                         tempParameters.push(name);
-                        emit(name);
+                        emitNode(name);
                     }
                     else {
-                        emit(node.name);
+                        emitNode(node.name);
                     }
                 }
                 else {
                     if (node.dotDotDotToken) {
                         write("...");
                     }
-                    emit(node.name);
+                    emitNode(node.name);
                     emitOptional(" = ", node.initializer);
                 }
             }
@@ -3343,9 +3345,10 @@ module ts {
                         }
                         else if (p.initializer) {
                             writeLine();
+                            emitLeadingComments(p);
                             emitStart(p);
                             write("if (");
-                            emitNode(p.name);
+                            emitJavaScriptWorker(p.name);
                             write(" === void 0)");
                             emitEnd(p);
                             write(" { ");
@@ -3355,6 +3358,7 @@ module ts {
                             emitNode(p.initializer);
                             emitEnd(p);
                             write("; }");
+                            emitTrailingComments(p);
                         }
                     });
                 }
@@ -3390,7 +3394,7 @@ module ts {
                     increaseIndent();
                     writeLine();
                     emitStart(restParam);
-                    emitNode(restParam.name);
+                    emitJavaScriptWorker(restParam.name);
                     write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
                     emitEnd(restParam);
                     decreaseIndent();
@@ -3401,7 +3405,7 @@ module ts {
 
             function emitAccessor(node: AccessorDeclaration) {
                 write(node.kind === SyntaxKind.GetAccessor ? "get " : "set ");
-                emit(node.name);
+                emitNode(node.name);
                 emitSignatureAndBody(node);
             }
 
@@ -3426,7 +3430,7 @@ module ts {
                 }
 
                 if (node.kind === SyntaxKind.FunctionDeclaration || (node.kind === SyntaxKind.FunctionExpression && node.name)) {
-                    emit(node.name);
+                    emitNode(node.name);
                 }
                 emitSignatureAndBody(node);
                 if (node.kind !== SyntaxKind.MethodDeclaration && node.kind !== SyntaxKind.MethodSignature) {
@@ -3458,7 +3462,7 @@ module ts {
             function emitSignatureParametersForArrow(node: FunctionLikeDeclaration) {
                 // Check whether the parameter list needs parentheses and preserve no-parenthesis
                 if (node.parameters.length === 1 && node.pos === node.parameters[0].pos) {
-                    emit(node.parameters[0]);
+                    emitNode(node.parameters[0]);
                     return;
                 }
                 emitSignatureParameters(node);
@@ -3514,7 +3518,7 @@ module ts {
 
                             // Don't emit comments on this body.  We'll have already taken care of it above 
                             // when we called emitDetachedComments.
-                            emitNode(node.body, /*disableComments:*/ true);
+                            emitJavaScriptWorker(node.body);
                             emitEnd(node.body);
                             write(";");
                             emitTempDeclarations(/*newLine*/ false);
@@ -3531,7 +3535,9 @@ module ts {
                                 writeLine();
                                 emitLeadingComments(node.body);
                                 write("return ");
-                                emit(node.body, /*disableComments:*/ true);
+                                emitStart(node.body);
+                                emitJavaScriptWorker(node.body);
+                                emitEnd(node.body);
                                 write(";");
                                 emitTrailingComments(node.body);
                             }
@@ -3559,7 +3565,7 @@ module ts {
                     emitStart(node);
                     emitModuleMemberName(node);
                     write(" = ");
-                    emit(node.name);
+                    emitNode(node.name);
                     emitEnd(node);
                     write(";");
                 }
@@ -3590,10 +3596,10 @@ module ts {
                         emitStart(param);
                         emitStart(param.name);
                         write("this.");
-                        emitNode(param.name);
+                        emitJavaScriptWorker(param.name);
                         emitEnd(param.name);
                         write(" = ");
-                        emit(param.name);
+                        emitNode(param.name);
                         write(";");
                         emitEnd(param);
                     }
@@ -3603,7 +3609,7 @@ module ts {
             function emitMemberAccessForPropertyName(memberName: DeclarationName) {
                 if (memberName.kind === SyntaxKind.StringLiteral || memberName.kind === SyntaxKind.NumericLiteral) {
                     write("[");
-                    emitNode(memberName);
+                    emitJavaScriptWorker(memberName);
                     write("]");
                 }
                 else if (memberName.kind === SyntaxKind.ComputedPropertyName) {
@@ -3611,7 +3617,7 @@ module ts {
                 }
                 else {
                     write(".");
-                    emitNode(memberName);
+                    emitJavaScriptWorker(memberName);
                 }
             }
 
@@ -3621,17 +3627,19 @@ module ts {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
+                        emitLeadingComments((<PropertyDeclaration>member).name);
                         emitStart((<PropertyDeclaration>member).name);
                         if (staticFlag) {
-                            emitNode(node.name);
+                            emitJavaScriptWorker(node.name);
                         }
                         else {
                             write("this");
                         }
                         emitMemberAccessForPropertyName((<PropertyDeclaration>member).name);
                         emitEnd((<PropertyDeclaration>member).name);
+                        emitTrailingComments((<PropertyDeclaration>member).name);
                         write(" = ");
-                        emit((<PropertyDeclaration>member).initializer);
+                        emitNode((<PropertyDeclaration>member).initializer);
                         write(";");
                         emitEnd(member);
                         emitTrailingComments(member);
@@ -3649,13 +3657,15 @@ module ts {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
+                        emitLeadingComments((<MethodDeclaration>member).name);
                         emitStart((<MethodDeclaration>member).name);
-                        emitNode(node.name);
+                        emitJavaScriptWorker(node.name);
                         if (!(member.flags & NodeFlags.Static)) {
                             write(".prototype");
                         }
                         emitMemberAccessForPropertyName((<MethodDeclaration>member).name);
                         emitEnd((<MethodDeclaration>member).name);
+                        emitTrailingComments((<MethodDeclaration>member).name);
                         write(" = ");
                         emitStart(member);
                         emitFunctionDeclaration(<MethodDeclaration>member);
@@ -3671,7 +3681,7 @@ module ts {
                             emitStart(member);
                             write("Object.defineProperty(");
                             emitStart((<AccessorDeclaration>member).name);
-                            emitNode(node.name);
+                            emitJavaScriptWorker(node.name);
                             if (!(member.flags & NodeFlags.Static)) {
                                 write(".prototype");
                             }
@@ -3717,7 +3727,7 @@ module ts {
 
             function emitClassDeclaration(node: ClassDeclaration) {
                 write("var ");
-                emit(node.name);
+                emitNode(node.name);
                 write(" = (function (");
                 var baseTypeNode = getClassBaseTypeNode(node);
                 if (baseTypeNode) {
@@ -3730,7 +3740,7 @@ module ts {
                     writeLine();
                     emitStart(baseTypeNode);
                     write("__extends(");
-                    emit(node.name);
+                    emitNode(node.name);
                     write(", _super);");
                     emitEnd(baseTypeNode);
                 }
@@ -3741,7 +3751,7 @@ module ts {
                 writeLine();
                 function emitClassReturnStatement() {
                     write("return ");
-                    emitNode(node.name);
+                    emitJavaScriptWorker(node.name);
                 }
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end, emitClassReturnStatement);
                 write(";");
@@ -3752,7 +3762,7 @@ module ts {
                 emitStart(node);
                 write(")(");
                 if (baseTypeNode) {
-                    emit(baseTypeNode.typeName);
+                    emitNode(baseTypeNode.typeName);
                 }
                 write(");");
                 emitEnd(node);
@@ -3761,7 +3771,7 @@ module ts {
                     emitStart(node);
                     emitModuleMemberName(node);
                     write(" = ");
-                    emit(node.name);
+                    emitNode(node.name);
                     emitEnd(node);
                     write(";");
                 }
@@ -3786,7 +3796,7 @@ module ts {
                     }
                     emitStart(<Node>ctor || node);
                     write("function ");
-                    emit(node.name);
+                    emitNode(node.name);
                     emitSignatureParameters(ctor);
                     write(" {");
                     scopeEmitStart(node, "constructor");
@@ -3802,7 +3812,7 @@ module ts {
                             var superCall = findInitialSuperCall(ctor);
                             if (superCall) {
                                 writeLine();
-                                emit(superCall);
+                                emitNode(superCall);
                             }
                         }
                         emitParameterPropertyAssignments(ctor);
@@ -3857,7 +3867,7 @@ module ts {
                 if (!(node.flags & NodeFlags.Export)) {
                     emitStart(node);
                     write("var ");
-                    emit(node.name);
+                    emitNode(node.name);
                     emitEnd(node);
                     write(";");
                 }
@@ -3885,7 +3895,7 @@ module ts {
                     writeLine();
                     emitStart(node);
                     write("var ");
-                    emit(node.name);
+                    emitNode(node.name);
                     write(" = ");
                     emitModuleMemberName(node);
                     emitEnd(node);
@@ -3919,7 +3929,7 @@ module ts {
                 }
 
                 if (member.initializer) {
-                    emit(member.initializer);
+                    emitNode(member.initializer);
                 }
                 else {
                     write("undefined");
@@ -3947,7 +3957,7 @@ module ts {
 
                 emitStart(node);
                 write("var ");
-                emit(node.name);
+                emitNode(node.name);
                 write(";");
                 emitEnd(node);
                 writeLine();
@@ -3962,7 +3972,7 @@ module ts {
                     var saveTempVariables = tempVariables;
                     tempCount = 0;
                     tempVariables = undefined;
-                    emit(node.body);
+                    emitNode(node.body);
                     tempCount = saveTempCount;
                     tempVariables = saveTempVariables;
                 }
@@ -3972,7 +3982,7 @@ module ts {
                     scopeEmitStart(node);
                     emitCaptureThisForNodeIfNecessary(node);
                     writeLine();
-                    emit(node.body);
+                    emitNode(node.body);
                     decreaseIndent();
                     writeLine();
                     var moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
@@ -3981,7 +3991,7 @@ module ts {
                 }
                 write(")(");
                 if (node.flags & NodeFlags.Export) {
-                    emit(node.name);
+                    emitNode(node.name);
                     write(" = ");
                 }
                 emitModuleMemberName(node);
@@ -4009,7 +4019,7 @@ module ts {
                             emitStart(node);
                             emitModuleMemberName(node);
                             write(" = ");
-                            emit(node.name);
+                            emitNode(node.name);
                             write(";");
                             emitEnd(node);
                             emitTrailingComments(node);
@@ -4023,7 +4033,7 @@ module ts {
                         emitModuleMemberName(node);
                         write(" = ");
                         if (isInternalModuleImportDeclaration(node)) {
-                            emit(node.moduleReference);
+                            emitNode(node.moduleReference);
                         }
                         else {
                             var literal = <LiteralExpression>getExternalModuleImportDeclarationExpression(node);
@@ -4078,7 +4088,7 @@ module ts {
                 write("], function (require, exports");
                 forEach(imports, imp => {
                     write(", ");
-                    emit(imp.name);
+                    emitNode(imp.name);
                 });
                 write(") {");
                 increaseIndent();
@@ -4126,7 +4136,7 @@ module ts {
                         if (startWithNewLine || i > 0) {
                             writeLine();
                         }
-                        emit(statements[i]);
+                        emitNode(statements[i]);
                     }
                     else {
                         // return index of the first non prologue directive
@@ -4178,7 +4188,7 @@ module ts {
                 emitLeadingComments(node.endOfFileToken);
             }
 
-            function emitNode(node: Node, disableComments?:boolean): void {
+            function emitNode(node: Node): void {
                 if (!node) {
                     return;
                 }
@@ -4187,12 +4197,12 @@ module ts {
                     return emitPinnedOrTripleSlashComments(node);
                 }
 
-                var emitComments = !disableComments && shouldEmitLeadingAndTrailingComments(node);
+                var emitComments = shouldEmitLeadingAndTrailingComments(node);
                 if (emitComments) {
                     emitLeadingComments(node);
                 }
 
-                emitJavaScriptWorker(node);
+                emitJavascript(node);
 
                 if (emitComments) {
                     emitTrailingComments(node);
@@ -4289,7 +4299,7 @@ module ts {
                     case SyntaxKind.TaggedTemplateExpression:
                         return emitTaggedTemplateExpression(<TaggedTemplateExpression>node);
                     case SyntaxKind.TypeAssertionExpression:
-                        return emit((<TypeAssertion>node).expression);
+                        return emitNode((<TypeAssertion>node).expression);
                     case SyntaxKind.ParenthesizedExpression:
                         return emitParenExpression(<ParenthesizedExpression>node);
                     case SyntaxKind.FunctionDeclaration:
diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map
index 98c414397628d..b3a8df96d134e 100644
--- a/tests/baselines/reference/contextualTyping.js.map
+++ b/tests/baselines/reference/contextualTyping.js.map
@@ -1,2 +1,2 @@
 //// [contextualTyping.js.map]
-{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAaA,AADA,sCAAsC;IAChC,IAAI;IAAVA,SAAMA,IAAIA;QACNC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAGD,AADA,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAGD,AADA,gCAAgC;IAC5B,IAAI,GAA0B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAGF,AADA,qCAAqC;IAC/B,IAAI;IAENC,SAFEA,IAAIA;QAGFC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAGD,AADA,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAGD,AADA,+BAA+B;IAC3B,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAG9D,AADA,kCAAkC;IAC9B,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;SAChB,IAAI,CAAC,CAAsB,KAAI;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAGH,AADA,4BAA4B;IACxB,KAAK,GAA8B;IAAa,MAAM,CAAC,UAAS,CAAC;QAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;IAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAG/F,AADA,0BAA0B;IACpB,KAAK;IAAGC,SAARA,KAAKA,CAAeA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAGrD,AADA,qCAAqC;IACjC,KAAK,GAA2B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC;IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA;AAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
+{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":["C1T5","C1T5.constructor","C2T5","C4T5","C4T5.constructor","C5T5","C11t5","C11t5.constructor","EF1","Point"],"mappings":"AAYA,sCAAsC;AACtC,IAAM,IAAI;IAAVA,SAAMA,IAAIA;QACNC,QAAGA,GAAqCA,UAASA,CAACA;YAC9C,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IAADD,WAACA;AAADA,CAACA,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAGA,GAAqCA,UAASA,CAACA;QACzD,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC,IAAM,IAAI;IAENC,SAFEA,IAAIA;QAGFC,IAAIA,CAACA,GAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;YACpB,MAAM,CAAC,CAAC,CAAC;QACb,CAAC,CAAAA;IACLA,CAACA;IACLD,WAACA;AAADA,CAACA,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI,EAAC,CAAC;IACEE,QAAqCA,CAACA;IACjDA,QAAGA,GAAGA,UAASA,CAACA,EAAEA,CAACA;QACf,MAAM,CAAC,CAAC,CAAC;IACb,CAAC,CAAAA;AACLA,CAACA,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,AADA,yBAAyB;SAChB,IAAI,CAAC,CAAsB,KAAI;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,MAAM,CAAO,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B;IAAa,MAAM,CAAC,UAAS,CAAC;QAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;IAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B,IAAM,KAAK;IAAGC,SAARA,KAAKA,CAAeA,CAAsBA;IAAIC,CAACA;IAACD,YAACA;AAADA,CAACA,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB;IAAa,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAO,CAAC,EAAE,CAAC,CAAA;AAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ;IAAI,MAAM,CAAC,CAAC,CAAA;AAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC;IAAI,MAAM,CAAC,CAAC,CAAC;AAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC;QAAI,MAAM,CAAC,CAAC,CAAC;IAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,SAAS,GAAG,CAAC,CAAC,EAAC,CAAC;IAAIE,MAAMA,CAACA,CAACA,GAACA,CAACA,CAACA;AAACA,CAACA;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC;IACfC,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IACXA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA;IAEXA,MAAMA,CAACA,IAAIA,CAACA;AAChBA,CAACA;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 6f9c9d2c1ecc8..180389e351285 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -10,8 +10,7 @@ sourceFile:contextualTyping.ts
 -------------------------------------------------------------------
 >>>// CONTEXT: Class property declaration
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >// DEFAULT INTERFACES
   >interface IFoo {
   >    n: number;
@@ -24,23 +23,23 @@ sourceFile:contextualTyping.ts
   >    foo: IFoo;
   >}
   >
-  >// CONTEXT: Class property declaration
   >
-2 >
-3 >// CONTEXT: Class property declaration
-1 >Emitted(1, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(13, 1) + SourceIndex(0)
-3 >Emitted(1, 39) Source(13, 39) + SourceIndex(0)
+2 >// CONTEXT: Class property declaration
+1 >Emitted(1, 1) Source(13, 1) + SourceIndex(0)
+2 >Emitted(1, 39) Source(13, 39) + SourceIndex(0)
 ---
 >>>var C1T5 = (function () {
-1 >^^^^
-2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^^^^
+4 >        ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    C1T5
-1 >Emitted(2, 5) Source(14, 7) + SourceIndex(0)
-2 >Emitted(2, 9) Source(14, 11) + SourceIndex(0)
+  >
+2 >class 
+3 >    C1T5
+1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(14, 7) + SourceIndex(0)
+3 >Emitted(2, 9) Source(14, 11) + SourceIndex(0)
 ---
 >>>    function C1T5() {
 1->^^^^
@@ -141,17 +140,13 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Module property declaration
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Module property declaration
   >
-2 >
-3 >// CONTEXT: Module property declaration
-1->Emitted(10, 1) Source(21, 1) + SourceIndex(0)
-2 >Emitted(10, 1) Source(20, 1) + SourceIndex(0)
-3 >Emitted(10, 40) Source(20, 40) + SourceIndex(0)
+2 >// CONTEXT: Module property declaration
+1->Emitted(10, 1) Source(20, 1) + SourceIndex(0)
+2 >Emitted(10, 40) Source(20, 40) + SourceIndex(0)
 ---
 >>>var C2T5;
 1 >
@@ -271,38 +266,37 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Variable declaration
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Variable declaration
   >
-2 >
-3 >// CONTEXT: Variable declaration
-1->Emitted(17, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(17, 1) Source(27, 1) + SourceIndex(0)
-3 >Emitted(17, 33) Source(27, 33) + SourceIndex(0)
+2 >// CONTEXT: Variable declaration
+1->Emitted(17, 1) Source(27, 1) + SourceIndex(0)
+2 >Emitted(17, 33) Source(27, 33) + SourceIndex(0)
 ---
 >>>var c3t1 = (function (s) {
-1 >^^^^
-2 >    ^^^^
-3 >        ^^^
-4 >           ^
-5 >            ^^^^^^^^^^
-6 >                      ^
+1 >
+2 >^^^^
+3 >    ^^^^
+4 >        ^^^
+5 >           ^
+6 >            ^^^^^^^^^^
+7 >                      ^
 1 >
-  >var 
-2 >    c3t1
-3 >        : (s: string) => string = 
-4 >           (
-5 >            function(
-6 >                      s
-1 >Emitted(18, 5) Source(28, 5) + SourceIndex(0)
-2 >Emitted(18, 9) Source(28, 9) + SourceIndex(0)
-3 >Emitted(18, 12) Source(28, 35) + SourceIndex(0)
-4 >Emitted(18, 13) Source(28, 36) + SourceIndex(0)
-5 >Emitted(18, 23) Source(28, 45) + SourceIndex(0)
-6 >Emitted(18, 24) Source(28, 46) + SourceIndex(0)
+  >
+2 >var 
+3 >    c3t1
+4 >        : (s: string) => string = 
+5 >           (
+6 >            function(
+7 >                      s
+1 >Emitted(18, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(18, 5) Source(28, 5) + SourceIndex(0)
+3 >Emitted(18, 9) Source(28, 9) + SourceIndex(0)
+4 >Emitted(18, 12) Source(28, 35) + SourceIndex(0)
+5 >Emitted(18, 13) Source(28, 36) + SourceIndex(0)
+6 >Emitted(18, 23) Source(28, 45) + SourceIndex(0)
+7 >Emitted(18, 24) Source(28, 46) + SourceIndex(0)
 ---
 >>>    return s;
 1 >^^^^
@@ -995,27 +989,26 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Class property assignment
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Class property assignment
   >
-2 >
-3 >// CONTEXT: Class property assignment
-1->Emitted(56, 1) Source(56, 1) + SourceIndex(0)
-2 >Emitted(56, 1) Source(55, 1) + SourceIndex(0)
-3 >Emitted(56, 38) Source(55, 38) + SourceIndex(0)
+2 >// CONTEXT: Class property assignment
+1->Emitted(56, 1) Source(55, 1) + SourceIndex(0)
+2 >Emitted(56, 38) Source(55, 38) + SourceIndex(0)
 ---
 >>>var C4T5 = (function () {
-1 >^^^^
-2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^^^^
+4 >        ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    C4T5
-1 >Emitted(57, 5) Source(56, 7) + SourceIndex(0)
-2 >Emitted(57, 9) Source(56, 11) + SourceIndex(0)
+  >
+2 >class 
+3 >    C4T5
+1 >Emitted(57, 1) Source(56, 1) + SourceIndex(0)
+2 >Emitted(57, 5) Source(56, 7) + SourceIndex(0)
+3 >Emitted(57, 9) Source(56, 11) + SourceIndex(0)
 ---
 >>>    function C4T5() {
 1->^^^^
@@ -1136,17 +1129,13 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Module property assignment
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Module property assignment
   >
-2 >
-3 >// CONTEXT: Module property assignment
-1->Emitted(65, 1) Source(66, 1) + SourceIndex(0)
-2 >Emitted(65, 1) Source(65, 1) + SourceIndex(0)
-3 >Emitted(65, 39) Source(65, 39) + SourceIndex(0)
+2 >// CONTEXT: Module property assignment
+1->Emitted(65, 1) Source(65, 1) + SourceIndex(0)
+2 >Emitted(65, 39) Source(65, 39) + SourceIndex(0)
 ---
 >>>var C5T5;
 1 >
@@ -1286,30 +1275,29 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Variable assignment
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Variable assignment
   >
-2 >
-3 >// CONTEXT: Variable assignment
-1->Emitted(73, 1) Source(74, 1) + SourceIndex(0)
-2 >Emitted(73, 1) Source(73, 1) + SourceIndex(0)
-3 >Emitted(73, 32) Source(73, 32) + SourceIndex(0)
+2 >// CONTEXT: Variable assignment
+1->Emitted(73, 1) Source(73, 1) + SourceIndex(0)
+2 >Emitted(73, 32) Source(73, 32) + SourceIndex(0)
 ---
 >>>var c6t5;
-1 >^^^^
-2 >    ^^^^
-3 >        ^
-4 >         ^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^^^^
+4 >        ^
+5 >         ^^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    c6t5: (n: number) => IFoo
-3 >        ;
-1 >Emitted(74, 5) Source(74, 5) + SourceIndex(0)
-2 >Emitted(74, 9) Source(74, 30) + SourceIndex(0)
-3 >Emitted(74, 10) Source(74, 31) + SourceIndex(0)
+  >
+2 >var 
+3 >    c6t5: (n: number) => IFoo
+4 >        ;
+1 >Emitted(74, 1) Source(74, 1) + SourceIndex(0)
+2 >Emitted(74, 5) Source(74, 5) + SourceIndex(0)
+3 >Emitted(74, 9) Source(74, 30) + SourceIndex(0)
+4 >Emitted(74, 10) Source(74, 31) + SourceIndex(0)
 ---
 >>>c6t5 = function (n) {
 1->
@@ -1366,30 +1354,29 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Array index assignment
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Array index assignment
   >
-2 >
-3 >// CONTEXT: Array index assignment
-1->Emitted(78, 1) Source(78, 1) + SourceIndex(0)
-2 >Emitted(78, 1) Source(77, 1) + SourceIndex(0)
-3 >Emitted(78, 35) Source(77, 35) + SourceIndex(0)
+2 >// CONTEXT: Array index assignment
+1->Emitted(78, 1) Source(77, 1) + SourceIndex(0)
+2 >Emitted(78, 35) Source(77, 35) + SourceIndex(0)
 ---
 >>>var c7t2;
-1 >^^^^
-2 >    ^^^^
-3 >        ^
-4 >         ^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^^^^
+4 >        ^
+5 >         ^^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    c7t2: IFoo[]
-3 >        ;
-1 >Emitted(79, 5) Source(78, 5) + SourceIndex(0)
-2 >Emitted(79, 9) Source(78, 17) + SourceIndex(0)
-3 >Emitted(79, 10) Source(78, 18) + SourceIndex(0)
+  >
+2 >var 
+3 >    c7t2: IFoo[]
+4 >        ;
+1 >Emitted(79, 1) Source(78, 1) + SourceIndex(0)
+2 >Emitted(79, 5) Source(78, 5) + SourceIndex(0)
+3 >Emitted(79, 9) Source(78, 17) + SourceIndex(0)
+4 >Emitted(79, 10) Source(78, 18) + SourceIndex(0)
 ---
 >>>c7t2[0] = ({ n: 1 });
 1->
@@ -2358,30 +2345,29 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Return statement
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Return statement
   >
-2 >
-3 >// CONTEXT: Return statement
-1->Emitted(126, 1) Source(152, 1) + SourceIndex(0)
-2 >Emitted(126, 1) Source(151, 1) + SourceIndex(0)
-3 >Emitted(126, 29) Source(151, 29) + SourceIndex(0)
+2 >// CONTEXT: Return statement
+1->Emitted(126, 1) Source(151, 1) + SourceIndex(0)
+2 >Emitted(126, 29) Source(151, 29) + SourceIndex(0)
 ---
 >>>var c10t5 = function () {
-1 >^^^^
-2 >    ^^^^^
-3 >         ^^^
-4 >            ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^^^^^
+4 >         ^^^
+5 >            ^^^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    c10t5
-3 >         : () => (n: number) => IFoo = 
-1 >Emitted(127, 5) Source(152, 5) + SourceIndex(0)
-2 >Emitted(127, 10) Source(152, 10) + SourceIndex(0)
-3 >Emitted(127, 13) Source(152, 40) + SourceIndex(0)
+  >
+2 >var 
+3 >    c10t5
+4 >         : () => (n: number) => IFoo = 
+1 >Emitted(127, 1) Source(152, 1) + SourceIndex(0)
+2 >Emitted(127, 5) Source(152, 5) + SourceIndex(0)
+3 >Emitted(127, 10) Source(152, 10) + SourceIndex(0)
+4 >Emitted(127, 13) Source(152, 40) + SourceIndex(0)
 ---
 >>>    return function (n) {
 1->^^^^
@@ -2448,28 +2434,27 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Newing a class
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                          ^->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^->
 1->
   >
-  >// CONTEXT: Newing a class
   >
-2 >
-3 >// CONTEXT: Newing a class
-1->Emitted(132, 1) Source(155, 1) + SourceIndex(0)
-2 >Emitted(132, 1) Source(154, 1) + SourceIndex(0)
-3 >Emitted(132, 27) Source(154, 27) + SourceIndex(0)
+2 >// CONTEXT: Newing a class
+1->Emitted(132, 1) Source(154, 1) + SourceIndex(0)
+2 >Emitted(132, 27) Source(154, 27) + SourceIndex(0)
 ---
 >>>var C11t5 = (function () {
-1->^^^^
-2 >    ^^^^^
-3 >         ^^^^^^^^^^^^^^^->
+1->
+2 >^^^^
+3 >    ^^^^^
+4 >         ^^^^^^^^^^^^^^^->
 1->
-  >class 
-2 >    C11t5
-1->Emitted(133, 5) Source(155, 7) + SourceIndex(0)
-2 >Emitted(133, 10) Source(155, 12) + SourceIndex(0)
+  >
+2 >class 
+3 >    C11t5
+1->Emitted(133, 1) Source(155, 1) + SourceIndex(0)
+2 >Emitted(133, 5) Source(155, 7) + SourceIndex(0)
+3 >Emitted(133, 10) Source(155, 12) + SourceIndex(0)
 ---
 >>>    function C11t5(f) {
 1->^^^^
@@ -2598,38 +2583,37 @@ sourceFile:contextualTyping.ts
 ---
 >>>// CONTEXT: Type annotated expression
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >// CONTEXT: Type annotated expression
   >
-2 >
-3 >// CONTEXT: Type annotated expression
-1->Emitted(142, 1) Source(159, 1) + SourceIndex(0)
-2 >Emitted(142, 1) Source(158, 1) + SourceIndex(0)
-3 >Emitted(142, 38) Source(158, 38) + SourceIndex(0)
+2 >// CONTEXT: Type annotated expression
+1->Emitted(142, 1) Source(158, 1) + SourceIndex(0)
+2 >Emitted(142, 38) Source(158, 38) + SourceIndex(0)
 ---
 >>>var c12t1 = (function (s) {
-1 >^^^^
-2 >    ^^^^^
-3 >         ^^^
-4 >            ^
-5 >             ^^^^^^^^^^
-6 >                       ^
+1 >
+2 >^^^^
+3 >    ^^^^^
+4 >         ^^^
+5 >            ^
+6 >             ^^^^^^^^^^
+7 >                       ^
 1 >
-  >var 
-2 >    c12t1
-3 >          = <(s: string) => string> 
-4 >            (
-5 >             function(
-6 >                       s
-1 >Emitted(143, 5) Source(159, 5) + SourceIndex(0)
-2 >Emitted(143, 10) Source(159, 10) + SourceIndex(0)
-3 >Emitted(143, 13) Source(159, 37) + SourceIndex(0)
-4 >Emitted(143, 14) Source(159, 38) + SourceIndex(0)
-5 >Emitted(143, 24) Source(159, 47) + SourceIndex(0)
-6 >Emitted(143, 25) Source(159, 48) + SourceIndex(0)
+  >
+2 >var 
+3 >    c12t1
+4 >          = <(s: string) => string> 
+5 >            (
+6 >             function(
+7 >                       s
+1 >Emitted(143, 1) Source(159, 1) + SourceIndex(0)
+2 >Emitted(143, 5) Source(159, 5) + SourceIndex(0)
+3 >Emitted(143, 10) Source(159, 10) + SourceIndex(0)
+4 >Emitted(143, 13) Source(159, 37) + SourceIndex(0)
+5 >Emitted(143, 14) Source(159, 38) + SourceIndex(0)
+6 >Emitted(143, 24) Source(159, 47) + SourceIndex(0)
+7 >Emitted(143, 25) Source(159, 48) + SourceIndex(0)
 ---
 >>>    return s;
 1 >^^^^
diff --git a/tests/baselines/reference/emitBOM.js.map b/tests/baselines/reference/emitBOM.js.map
index af5fd260813bb..69ccb88429509 100644
--- a/tests/baselines/reference/emitBOM.js.map
+++ b/tests/baselines/reference/emitBOM.js.map
@@ -1,2 +1,2 @@
 //// [emitBOM.js.map]
-{"version":3,"file":"emitBOM.js","sourceRoot":"","sources":["emitBOM.ts"],"names":[],"mappings":"AAEA,AADA,6DAA6D;IACzD,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"emitBOM.js","sourceRoot":"","sources":["emitBOM.ts"],"names":[],"mappings":"AACA,6DAA6D;AAC7D,IAAI,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBOM.sourcemap.txt b/tests/baselines/reference/emitBOM.sourcemap.txt
index cd49155d24f11..4cf35c4d1e39c 100644
--- a/tests/baselines/reference/emitBOM.sourcemap.txt
+++ b/tests/baselines/reference/emitBOM.sourcemap.txt
@@ -10,28 +10,27 @@ sourceFile:emitBOM.ts
 -------------------------------------------------------------------
 >>>// JS and d.ts output should have a BOM but not the sourcemap
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
-  >// JS and d.ts output should have a BOM but not the sourcemap
   >
-2 >
-3 >// JS and d.ts output should have a BOM but not the sourcemap
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-3 >Emitted(1, 62) Source(2, 62) + SourceIndex(0)
+2 >// JS and d.ts output should have a BOM but not the sourcemap
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 62) Source(2, 62) + SourceIndex(0)
 ---
 >>>var x;
-1 >^^^^
-2 >    ^
-3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^
+5 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    x
-3 >     ;
-1 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(2, 6) Source(3, 6) + SourceIndex(0)
-3 >Emitted(2, 7) Source(3, 7) + SourceIndex(0)
+  >
+2 >var 
+3 >    x
+4 >     ;
+1 >Emitted(2, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(2, 6) Source(3, 6) + SourceIndex(0)
+4 >Emitted(2, 7) Source(3, 7) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=emitBOM.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag.js.map b/tests/baselines/reference/out-flag.js.map
index 9247af9d5d45f..4892c63ba24bd 100644
--- a/tests/baselines/reference/out-flag.js.map
+++ b/tests/baselines/reference/out-flag.js.map
@@ -1,2 +1,2 @@
 //// [out-flag.js.map]
-{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count","MyClass.SetCount"],"mappings":"AAAA,eAAe;AAGf,AADA,oBAAoB;IACd,OAAO;IAAbA,SAAMA,OAAOA;IAYbC,CAACA;IAVGD,uBAAuBA;IAChBA,uBAAKA,GAAZA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IAEMF,0BAAQA,GAAfA,UAAgBA,KAAaA;QAEzBG,EAAEA;IACNA,CAACA;IACLH,cAACA;AAADA,CAACA,AAZD,IAYC"}
\ No newline at end of file
+{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count","MyClass.SetCount"],"mappings":"AAAA,eAAe;AAEf,oBAAoB;AACpB,IAAM,OAAO;IAAbA,SAAMA,OAAOA;IAYbC,CAACA;IAVGD,uBAAuBA;IAChBA,uBAAKA,GAAZA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IAEMF,0BAAQA,GAAfA,UAAgBA,KAAaA;QAEzBG,EAAEA;IACNA,CAACA;IACLH,cAACA;AAADA,CAACA,AAZD,IAYC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt
index c028914055216..aa2476416eb13 100644
--- a/tests/baselines/reference/out-flag.sourcemap.txt
+++ b/tests/baselines/reference/out-flag.sourcemap.txt
@@ -19,28 +19,27 @@ sourceFile:out-flag.ts
 ---
 >>>// my class comments
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^
-4 >                    ^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^
+3 >                    ^^^^^^^^^->
 1->
   >
-  >// my class comments
   >
-2 >
-3 >// my class comments
-1->Emitted(2, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(2, 1) Source(3, 1) + SourceIndex(0)
-3 >Emitted(2, 21) Source(3, 21) + SourceIndex(0)
+2 >// my class comments
+1->Emitted(2, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(2, 21) Source(3, 21) + SourceIndex(0)
 ---
 >>>var MyClass = (function () {
-1->^^^^
-2 >    ^^^^^^^
-3 >           ^^^^^^^^^^^^^^->
+1->
+2 >^^^^
+3 >    ^^^^^^^
+4 >           ^^^^^^^^^^^^^^->
 1->
-  >class 
-2 >    MyClass
-1->Emitted(3, 5) Source(4, 7) + SourceIndex(0)
-2 >Emitted(3, 12) Source(4, 14) + SourceIndex(0)
+  >
+2 >class 
+3 >    MyClass
+1->Emitted(3, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(4, 7) + SourceIndex(0)
+3 >Emitted(3, 12) Source(4, 14) + SourceIndex(0)
 ---
 >>>    function MyClass() {
 1->^^^^
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index ea13c12204d2c..ce4cc85fe39f0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
index 7d8b76cac055c..a47906e306002 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index 3153725651cee..4606cc7088813 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
index 7d8b76cac055c..a47906e306002 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index c90b960a80ec6..07f96a2a571d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 7d8b76cac055c..a47906e306002 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 30ffc64617ed7..41dbd6c1ef1ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 7d8b76cac055c..a47906e306002 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6f1ddfd7dd75d..e3fea49d2bea3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index ef107bb75b808..5fac241da05f6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 6f1ddfd7dd75d..e3fea49d2bea3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 2e21de11e01d7..fb8e17fc023da 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index d9a8564525c2e..71394f458f8fb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 7c4f8ffc229b1..301f4a52eb007 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index d9a8564525c2e..71394f458f8fb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 9e1907a3f19e8..4420422b462fb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 02cad9b9ab3e7..9dc55ab9fe6ca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
index b592e001a98fe..e3b0ab1b34610 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 02cad9b9ab3e7..9dc55ab9fe6ca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map
index b592e001a98fe..e3b0ab1b34610 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 3b087cd34db2d..18fb4805b4bf7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index b592e001a98fe..e3b0ab1b34610 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 3b087cd34db2d..18fb4805b4bf7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index b592e001a98fe..e3b0ab1b34610 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 1812f2fecd5e6..dd5ff8290eb9a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 6c42e7229b3cd..26298d89a07db 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
index 1812f2fecd5e6..dd5ff8290eb9a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 6c42e7229b3cd..26298d89a07db 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 9b5860b612bc8..eb03361cbb75d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map
index b0471f2c948aa..828285aef12ae 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 9b5860b612bc8..eb03361cbb75d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map
index b0471f2c948aa..828285aef12ae 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 47fa7e7519990..d1c771f1837b5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b0471f2c948aa..828285aef12ae 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 47fa7e7519990..d1c771f1837b5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b0471f2c948aa..828285aef12ae 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
index 4217335db6275..5e6daa0c2dc27 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 92885552f3f7b..b55918da20e41 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
index 4217335db6275..5e6daa0c2dc27 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 92885552f3f7b..b55918da20e41 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 949c8b0134905..404cf1316f64e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
index b1ba0007b51be..14aeae164829f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 949c8b0134905..404cf1316f64e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map
index b1ba0007b51be..14aeae164829f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 44c413210dcac..7ef8fcdbd7be7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b1ba0007b51be..14aeae164829f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 44c413210dcac..7ef8fcdbd7be7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b1ba0007b51be..14aeae164829f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 9593afdf5776b..95da3cc60827c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 6cdd1b8fc9edd..d694446e73854 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
index 9593afdf5776b..95da3cc60827c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 6cdd1b8fc9edd..d694446e73854 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 0c408c275ea69..861e82857d0ea 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
index 828e5f06c03dd..8a6c1a0cf52ce 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 3f303cae59a2d..52c73952c38b5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
index 828e5f06c03dd..8a6c1a0cf52ce 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 9465eaca080ae..5b31ef06309c4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 828e5f06c03dd..8a6c1a0cf52ce 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 1494a71e0c21b..6797bf93b473a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 828e5f06c03dd..8a6c1a0cf52ce 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 111caa88ab613..10ec8c1f8099e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 33a1a16a5c54f..56939376f98bb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 111caa88ab613..10ec8c1f8099e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 100d1da6afd16..5599465ee7574 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 5bfeb8c37b16d..c668cf6c305df 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 090f794e06a60..1262bb479d99c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 5bfeb8c37b16d..c668cf6c305df 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index e6e8d34e4cb4c..51a0a32df4ceb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
index 29cc1bff12ee5..9e5815a559fd3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map
index 0893e2d067de5..179c289149350 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
index 29cc1bff12ee5..9e5815a559fd3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map
index 0893e2d067de5..179c289149350 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 20db52dd8e8ce..33363227a7313 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 0893e2d067de5..179c289149350 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 20db52dd8e8ce..33363227a7313 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 0893e2d067de5..179c289149350 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 3764898a5cf18..5373dc8df5126 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index 0346140ef3d5f..4d46093eb15d0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
index 3764898a5cf18..5373dc8df5126 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_multifolder/ref/m1.ts","../outputdir_multifolder_ref/m2.ts","../outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index 0346140ef3d5f..4d46093eb15d0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
index 144c281141e13..b181b23cad2bc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map
index b280e83c68487..89c43815f596e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
index 144c281141e13..b181b23cad2bc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map
index b280e83c68487..89c43815f596e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 4166fd0726b43..a2ff83395d19c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b280e83c68487..89c43815f596e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 4166fd0726b43..a2ff83395d19c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b280e83c68487..89c43815f596e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
index 9f094e0e243bf..ec0c91c68beb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index 080697760968c..001aaa600fcc4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
index 9f094e0e243bf..ec0c91c68beb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_simple/m1.ts","../outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index 080697760968c..001aaa600fcc4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
index c95281b0117cc..c3e7bbd525472 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map
index 3518a66e60677..8fb529a70e347 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
index c95281b0117cc..c3e7bbd525472 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map
index 3518a66e60677..8fb529a70e347 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 7a17ef73ca4ad..1e18b09672edf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 3518a66e60677..8fb529a70e347 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 7a17ef73ca4ad..1e18b09672edf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 3518a66e60677..8fb529a70e347 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 70b064b97a9c4..7659b26415c10 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 95712b2c3efd4..8bbf93129f411 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
index 70b064b97a9c4..7659b26415c10 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_subfolder/ref/m1.ts","../outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 95712b2c3efd4..8bbf93129f411 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
index dbacb509299a5..905d8262b0b8e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map
index ec46d44dd368a..72825f0c946a1 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
index 7f8e5e51eef7d..dbd495daf89af 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map
index ec46d44dd368a..72825f0c946a1 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index b055e0d85ac39..ac8273aae8880 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ec46d44dd368a..72825f0c946a1 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 101a39cb149aa..d07f861c16556 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index ec46d44dd368a..72825f0c946a1 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b8b1e81a1f714..88fbb7bd1374e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 8dbf7526563ea..6ce89467cc4dc 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b8b1e81a1f714..88fbb7bd1374e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 1805bde6293e7..306f45a9d4692 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6765e0e0fa67c..8881c9acd90cf 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index e5aca4bd24698..ca2d7b7853c6a 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 6765e0e0fa67c..8881c9acd90cf 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index ea467254de47d..c4c1a87c97f25 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
index 85447a672f9f9..0f8086bc0cd10 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map
index cc7aa790c7b47..54b74eb0fe496 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
index 85447a672f9f9..0f8086bc0cd10 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map
index cc7aa790c7b47..54b74eb0fe496 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index bf5416e3ae348..e300bf2d76963 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index cc7aa790c7b47..54b74eb0fe496 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index bf5416e3ae348..e300bf2d76963 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index cc7aa790c7b47..54b74eb0fe496 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
index d340083802709..2e89625570877 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 292e5cf400f60..8d224bf2b97ed 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
index d340083802709..2e89625570877 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 292e5cf400f60..8d224bf2b97ed 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
index 0779281197afe..66e4afd1b27e0 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map
index e10afd12d5f71..c1abeb35ee697 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
index 0779281197afe..66e4afd1b27e0 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map
index e10afd12d5f71..c1abeb35ee697 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 68c1cd3bce989..ff81c83a7594b 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index e10afd12d5f71..c1abeb35ee697 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 68c1cd3bce989..ff81c83a7594b 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index e10afd12d5f71..c1abeb35ee697 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
index 70062ed1d783c..a7e0a83574970 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
index c06e1433af5cd..db031afdb45ff 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
index 70062ed1d783c..a7e0a83574970 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_simple/m1.ts","file:///tests/cases/projects/outputdir_simple/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
index c06e1433af5cd..db031afdb45ff 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
index af2744979085f..9466e627cd540 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map
index 2cbc935e3ca3e..cc122604c9898 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
index af2744979085f..9466e627cd540 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map
index 2cbc935e3ca3e..cc122604c9898 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index ed6df05a4da87..0187a1e62278b 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 2cbc935e3ca3e..cc122604c9898 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index ed6df05a4da87..0187a1e62278b 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 2cbc935e3ca3e..cc122604c9898 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
index a83d7767a5850..5a976b1f2bdb5 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index e7181011976e6..cd83981397300 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
index a83d7767a5850..5a976b1f2bdb5 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_subfolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index e7181011976e6..cd83981397300 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index bbfd41971ea0f..8f673e8e25cee 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index cb5acf04cad3f..54dd569bade30 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 5c7fbf5598030..a85c870be3005 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 9358870a6880e..8e485d148d75e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index af09cb956f689..8272477f2e5fb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 7a63f82b06317..57e16e7b8e33f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index af09cb956f689..8272477f2e5fb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index edff71433ac18..0f2617a9ec104 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 2b043394866ed..255a12d50e144 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 1a6dfcfc5f374..39d766b838af8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 2b043394866ed..255a12d50e144 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 83af964a3ef36..db8ad515deaad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
index 470b42803891b..40b220280d223 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
index 470b42803891b..40b220280d223 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 4cfbf25edb54a..5377af2579291 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 4cfbf25edb54a..5377af2579291 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
index ece3a005e7500..1e52cfe664c09 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 5884efb5062e0..5ddb552b9fbfc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
index ece3a005e7500..1e52cfe664c09 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 5884efb5062e0..5ddb552b9fbfc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
index 0d6c41e9711b5..c036485f12fb4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
index 0d6c41e9711b5..c036485f12fb4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 77f1611c24e40..e54c5887bd9e7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 77f1611c24e40..e54c5887bd9e7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
index 8610dc814fc39..130330953ab8c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 93973163cd742..58bc6d0c00111 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
index 8610dc814fc39..130330953ab8c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 93973163cd742..58bc6d0c00111 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
index f437ff38afa68..5a9f73a59b63a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
index f437ff38afa68..5a9f73a59b63a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 5b1bcfef3e7cd..ffa87bf2a03e1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 5b1bcfef3e7cd..ffa87bf2a03e1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 677ccf1596dcb..f54d8cee1cedd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index f9478f2e3bcd8..6e28abdb305a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
index 677ccf1596dcb..f54d8cee1cedd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index f9478f2e3bcd8..6e28abdb305a6 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index 6777ff94467ba..01fce014f16b5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
index 59114b811dc16..6bde232312ad4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index 9250746237bc4..788c81e0451b3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
index 59114b811dc16..6bde232312ad4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 59114b811dc16..6bde232312ad4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index ef941ec852700..f62fe98b66f7e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 59114b811dc16..6bde232312ad4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 8a79efe75e990..89a1a914adf87 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index f21f73c29bbdc..218d4cb750560 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index b1c5507682cb6..a8d6996c83340 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index f21f73c29bbdc..218d4cb750560 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 6eea2973858bf..9454437b5d228 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 7f35721dda8bf..533d5c26f8dcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 39e33fa9c4f36..91f4302ce2087 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 7f35721dda8bf..533d5c26f8dcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 7943340db9777..ef99b3fb4f9ea 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index a932b4ba35e60..88702c6004cfd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
index 39be85e5c6154..712fa3388ea03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index a932b4ba35e60..88702c6004cfd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map
index 39be85e5c6154..712fa3388ea03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 39be85e5c6154..712fa3388ea03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 7e47593c4b737..8d87b0973a482 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 39be85e5c6154..712fa3388ea03 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 7e47593c4b737..8d87b0973a482 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 47c9541e0eb6d..84926b7b52e39 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 011daa6708bef..77c6a2f486998 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
index 47c9541e0eb6d..84926b7b52e39 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_multifolder/src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 011daa6708bef..77c6a2f486998 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 40f672bb0f269..78a472025a081 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map
index c50d8e4859f33..e21b7281e47e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 40f672bb0f269..78a472025a081 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map
index c50d8e4859f33..e21b7281e47e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index c50d8e4859f33..e21b7281e47e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 4a50fc2c7999d..e2e363b038556 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index c50d8e4859f33..e21b7281e47e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 4a50fc2c7999d..e2e363b038556 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
index e60662f68a5a6..33945ee6cfeed 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 28833a21cbc3f..6c999eb8a7eb3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
index e60662f68a5a6..33945ee6cfeed 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_simple/src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 28833a21cbc3f..6c999eb8a7eb3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index ee5822937fb6d..75b2724dad4f1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
index 09ec82b9dc64b..a9d17f3ec07bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index ee5822937fb6d..75b2724dad4f1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map
index 09ec82b9dc64b..a9d17f3ec07bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 09ec82b9dc64b..a9d17f3ec07bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index de87b327bb27e..e6969524f0931 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 09ec82b9dc64b..a9d17f3ec07bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index de87b327bb27e..e6969524f0931 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 489c554916e5a..d100382e0ce75 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index ade7f125bba05..15ddfcc573849 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
index 489c554916e5a..d100382e0ce75 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index ade7f125bba05..15ddfcc573849 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 280d86058739d..5d633198d84a8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
index e21190f8e2ef7..7024151441ded 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 7f4e9e1ddbe10..a102d06612566 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
index e21190f8e2ef7..7024151441ded 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index e21190f8e2ef7..7024151441ded 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index ee48016ceb97d..0615a10a753d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index e21190f8e2ef7..7024151441ded 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 95cca9bf57d66..0e15b3baa81cb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b86daf390ae0f..094d1b3333869 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 458add435ade4..dace4c62fde93 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index b86daf390ae0f..094d1b3333869 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 9e6b357fb2437..99785191eda28 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index e9865e31b38a8..67a29a5aef267 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index e881c0b785ddd..130cd9d250e54 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index e9865e31b38a8..67a29a5aef267 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 6312eb97268c7..07013b8a5e29a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
index e3ee3f7577172..05db5cc2c90c7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map
index 203c42359bdd1..32015cc52a0bd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
index e3ee3f7577172..05db5cc2c90c7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map
index 203c42359bdd1..32015cc52a0bd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 203c42359bdd1..32015cc52a0bd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index c89d3dadb381a..9067e546ad909 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 203c42359bdd1..32015cc52a0bd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index c89d3dadb381a..9067e546ad909 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 4b6e3515172be..7f9b18d227056 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index db35a4d65e9ca..28441aa2856f2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
index 4b6e3515172be..7f9b18d227056 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index db35a4d65e9ca..28441aa2856f2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
index 0019838beafd9..715f9996cb165 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map
index a3a4dda9ee27c..e1cdf64204c55 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
index 0019838beafd9..715f9996cb165 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map
index a3a4dda9ee27c..e1cdf64204c55 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a3a4dda9ee27c..e1cdf64204c55 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 8e3a977cca170..d9f15b54612c0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index a3a4dda9ee27c..e1cdf64204c55 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 8e3a977cca170..d9f15b54612c0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
index ca707d324611f..fa5f71cf36a54 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index 0450303b15f6c..6485288b029e0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
index ca707d324611f..fa5f71cf36a54 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index 0450303b15f6c..6485288b029e0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
index 914b521f34ba6..fd56160cf328a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map
index 17240f26218bf..2c6fe89105177 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
index 914b521f34ba6..fd56160cf328a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map
index 17240f26218bf..2c6fe89105177 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 17240f26218bf..2c6fe89105177 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index f7eb83a20d18b..a9acb49865b9a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 17240f26218bf..2c6fe89105177 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index f7eb83a20d18b..a9acb49865b9a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 4e19de36fe88b..9cc958326f4b3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 3f529a732cdd3..b8b9dc9d38fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
index 4e19de36fe88b..9cc958326f4b3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 3f529a732cdd3..b8b9dc9d38fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
index 8e10970ffcef1..8094a149191ce 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map
index 004deef64ee14..8b344a9cd0abd 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
index 7a872ddd5041b..da4c85d6d7e4e 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map
index 004deef64ee14..8b344a9cd0abd 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b3ee102444604..b22a3ad312322 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 77f7dd030d728..e02feb20a068a 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b3ee102444604..b22a3ad312322 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0ae77c78e64bc..040e8d71d5968 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:../../test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 6f1ddfd7dd75d..e3fea49d2bea3 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index f798f6bd54d8d..fb77e0f5174e1 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index 6f1ddfd7dd75d..e3fea49d2bea3 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index a6bfcf784e0e8..eec5310414653 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index d9a8564525c2e..71394f458f8fb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index a05ce4d647b54..363647f79903c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index d9a8564525c2e..71394f458f8fb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index adb046a3bcca7..4b964a7f34fad 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:../test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
index 8606d36acd475..a5cad400a9ed2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map
index 276a8b2a7204e..f3eb11735568c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
index 8606d36acd475..a5cad400a9ed2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map
index 276a8b2a7204e..f3eb11735568c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 521dbe5e313fb..4cf7aa4f05ec2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
index 11ece946281f1..d064c20ad4fb9 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 521dbe5e313fb..4cf7aa4f05ec2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
index 11ece946281f1..d064c20ad4fb9 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:../../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:../../../test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map
index 1812f2fecd5e6..dd5ff8290eb9a 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
index d8299995443c6..d5f27bdb51ecc 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map
index 1812f2fecd5e6..dd5ff8290eb9a 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
index d8299995443c6..d5f27bdb51ecc 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:../test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
index 7337d98d30b61..fb0a1e709db91 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map
index 66a78eca4fd2c..fc22ae7d1910b 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
index 7337d98d30b61..fb0a1e709db91 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map
index 66a78eca4fd2c..fc22ae7d1910b 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 5a197e3071b78..1b18525029095 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
index 4b35efc9982c9..8131240d6ee95 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 5a197e3071b78..1b18525029095 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
index 4b35efc9982c9..8131240d6ee95 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map
index 4217335db6275..5e6daa0c2dc27 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
index 5ace4e9d14116..f6da80e0186a5 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map
index 4217335db6275..5e6daa0c2dc27 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
index 5ace4e9d14116..f6da80e0186a5 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
index a8cf87e7c6ace..8524b84f45016 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map
index 3c65fcf31b806..75d674840a103 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
index a8cf87e7c6ace..8524b84f45016 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map
index 3c65fcf31b806..75d674840a103 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 071f3dc57705f..8250b00cc88cb 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
index c8f714c3481c3..96ce24dd6d3ea 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 071f3dc57705f..8250b00cc88cb 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
index c8f714c3481c3..96ce24dd6d3ea 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 9593afdf5776b..95da3cc60827c 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
index 5c3d682e6f97e..59907b06277c7 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map
index 9593afdf5776b..95da3cc60827c 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
index 5c3d682e6f97e..59907b06277c7 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index bdc0935072029..40ba136ebf792 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index 22f075a2c2664..339729910a05e 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 8ea7277b99910..4316f3e39b6c4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -365,17 +365,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -387,23 +382,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index c084feb0fd0f5..e9d11ed0987c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 406569f1a8fe0..6877f3a69f297 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -364,17 +364,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -386,23 +381,26 @@ sourceFile:test.ts
 2 >Emitted(2, 34) Source(2, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index af09cb956f689..8272477f2e5fb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index c0b44f4c066b2..d9ca543558130 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
index af09cb956f689..8272477f2e5fb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index c11097c512bc5..468cc52958311 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 2b043394866ed..255a12d50e144 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 3b975d2754087..ac1d83f49bdfe 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -359,17 +359,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -381,23 +376,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
index 2b043394866ed..255a12d50e144 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index b7ac7d33ad934..30825f0d6bb6e 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -358,17 +358,12 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(3, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>/// <reference path='ref/m2.ts'/>
 1->
@@ -380,23 +375,26 @@ sourceFile:test.ts
 2 >Emitted(12, 34) Source(2, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
-2 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
-3 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
-4 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
-5 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(13, 1) Source(3, 1) + SourceIndex(1)
+2 >Emitted(13, 5) Source(3, 5) + SourceIndex(1)
+3 >Emitted(13, 7) Source(3, 7) + SourceIndex(1)
+4 >Emitted(13, 10) Source(3, 10) + SourceIndex(1)
+5 >Emitted(13, 12) Source(3, 12) + SourceIndex(1)
+6 >Emitted(13, 13) Source(3, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
index 336519863e283..cf5deb3930e1b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
index 336519863e283..cf5deb3930e1b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 5698aa393c1a4..80d72c205429b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
index 4c01d4f1055cf..9c933c44f84a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAEA,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 5698aa393c1a4..80d72c205429b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -330,17 +330,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -352,23 +347,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(2, 59) Source(2, 59) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
-3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
-4 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
-5 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(3, 7) Source(3, 7) + SourceIndex(0)
+4 >Emitted(3, 10) Source(3, 10) + SourceIndex(0)
+5 >Emitted(3, 12) Source(3, 12) + SourceIndex(0)
+6 >Emitted(3, 13) Source(3, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
index ece3a005e7500..1e52cfe664c09 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 522133b61a49e..5e1ce976cc06c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
index ece3a005e7500..1e52cfe664c09 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACND,AAFA,iCAAiC;AACjC,0DAA0D;IACtD,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_multifolder/ref/m1.ts","outputdir_multifolder_ref/m2.ts","outputdir_multifolder/test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXC,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,0DAA0D;AAC1D,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 522133b61a49e..5e1ce976cc06c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -318,17 +318,12 @@ sourceFile:outputdir_multifolder/test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->/// <reference path='ref/m1.ts'/>
-  >/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(21, 1) Source(3, 1) + SourceIndex(2)
-2 >Emitted(21, 1) Source(1, 1) + SourceIndex(2)
-3 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(21, 1) Source(1, 1) + SourceIndex(2)
+2 >Emitted(21, 34) Source(1, 34) + SourceIndex(2)
 ---
 >>>/// <reference path='../outputdir_multifolder_ref/m2.ts'/>
 1->
@@ -340,23 +335,26 @@ sourceFile:outputdir_multifolder/test.ts
 2 >Emitted(22, 59) Source(2, 59) + SourceIndex(2)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
-2 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
-3 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
-4 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
-5 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(23, 1) Source(3, 1) + SourceIndex(2)
+2 >Emitted(23, 5) Source(3, 5) + SourceIndex(2)
+3 >Emitted(23, 7) Source(3, 7) + SourceIndex(2)
+4 >Emitted(23, 10) Source(3, 10) + SourceIndex(2)
+5 >Emitted(23, 12) Source(3, 12) + SourceIndex(2)
+6 >Emitted(23, 13) Source(3, 13) + SourceIndex(2)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
index 0c278b8a07aa2..dac9672d203ea 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
index 0c278b8a07aa2..dac9672d203ea 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 376e7fbb7425f..99551162f632a 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 228d40908fbaf..db056cf5c930b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 376e7fbb7425f..99551162f632a 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 30) Source(1, 30) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
index 8610dc814fc39..130330953ab8c 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 013a0298c468f..f6765a73915a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
index 8610dc814fc39..130330953ab8c 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,6BAA6B;IACzB,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,6BAA6B;AAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 013a0298c468f..f6765a73915a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='m1.ts'/>
-  >
-2 >
-3 >/// <reference path='m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 30) Source(1, 30) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
index d66cc47376898..9ce250d6cf05b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
index d66cc47376898..9ce250d6cf05b 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0d8c0c34ca826..cedb54fb89e2c 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 129e72171348c..42212a6b2d6fc 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AACA,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARA,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0d8c0c34ca826..cedb54fb89e2c 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -170,34 +170,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >/// <reference path='ref/m1.ts'/>
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
-2 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
-3 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
-4 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
-5 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(2, 7) Source(2, 7) + SourceIndex(0)
+4 >Emitted(2, 10) Source(2, 10) + SourceIndex(0)
+5 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+6 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 677ccf1596dcb..f54d8cee1cedd 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 627fd896eb619..9cd82ab5a5158 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
index 677ccf1596dcb..f54d8cee1cedd 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACPD,AADA,iCAAiC;IAC7B,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf,IAAM,KAAK;IAAXA,SAAMA,KAAKA;IAEXC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B,SAAS,KAAK;IACVE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;ACRD,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ,IAAM,EAAE;IAARC,SAAMA,EAAEA;IAERC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB,SAAS,EAAE;IACPE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 627fd896eb619..9cd82ab5a5158 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -164,34 +164,33 @@ sourceFile:test.ts
 -------------------------------------------------------------------
 >>>/// <reference path='ref/m1.ts'/>
 1->
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/// <reference path='ref/m1.ts'/>
-  >
-2 >
-3 >/// <reference path='ref/m1.ts'/>
-1->Emitted(11, 1) Source(2, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(1, 1) + SourceIndex(1)
-3 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+2 >/// <reference path='ref/m1.ts'/>
+1->Emitted(11, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(11, 34) Source(1, 34) + SourceIndex(1)
 ---
 >>>var a1 = 10;
-1 >^^^^
-2 >    ^^
-3 >      ^^^
-4 >         ^^
-5 >           ^
-6 >            ^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    a1
-3 >       = 
-4 >         10
-5 >           ;
-1 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
-2 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
-3 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
-4 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
-5 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
+2 >^^^^
+3 >    ^^
+4 >      ^^^
+5 >         ^^
+6 >           ^
+7 >            ^^^^^^^^^^^^->
+1 >
+  >
+2 >var 
+3 >    a1
+4 >       = 
+5 >         10
+6 >           ;
+1 >Emitted(12, 1) Source(2, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(2, 5) + SourceIndex(1)
+3 >Emitted(12, 7) Source(2, 7) + SourceIndex(1)
+4 >Emitted(12, 10) Source(2, 10) + SourceIndex(1)
+5 >Emitted(12, 12) Source(2, 12) + SourceIndex(1)
+6 >Emitted(12, 13) Source(2, 13) + SourceIndex(1)
 ---
 >>>var c1 = (function () {
 1->
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map
index d2e66a925a898..41e0692c4ad21 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js.map
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map
@@ -1,2 +1,2 @@
 //// [recursiveClassReferenceTest.js.map]
-{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,MAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC,IAAaA,eAAeA;oBAA5BC,SAAaA,eAAeA;oBAQ5BC,CAACA;oBANOD,+BAAKA,GAAZA;wBAAiBE,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,GAAfA,eAQZA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,WAAIA,KAAJA,WAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC,IAAaA,UAAUA;gBAKtBC,SALYA,UAAUA,CAKFA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAGvBA,AADAA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA;oBAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;wBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;oBAAAA,CAACA;gBAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,GAAVA,UAkBZA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD,IAAM,YAAY;IAAlBe,SAAMA,YAAYA;IAAqEC,CAACA;IAA3CD,sCAAeA,GAAtBA;QAAmCE,MAAMA,CAACA,IAAIA,CAACA;IAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC,IAAaA,KAAKA;oBACXC,SADMA,KAAKA,CACSA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA;wBAA0BI,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,GAALA,KAWZA,CAAAA;gBAEDA,IAAaA,IAAIA;oBAASM,UAAbA,IAAIA,UAAqBA;oBAAtCA,SAAaA,IAAIA;wBAASC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,GAAJA,IAQZA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
+{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":["Sample","Sample.Actions","Sample.Actions.Thing","Sample.Actions.Thing.Find","Sample.Actions.Thing.Find.StartFindAction","Sample.Actions.Thing.Find.StartFindAction.constructor","Sample.Actions.Thing.Find.StartFindAction.getId","Sample.Actions.Thing.Find.StartFindAction.run","Sample.Thing","Sample.Thing.Widgets","Sample.Thing.Widgets.FindWidget","Sample.Thing.Widgets.FindWidget.constructor","Sample.Thing.Widgets.FindWidget.gar","Sample.Thing.Widgets.FindWidget.getDomNode","Sample.Thing.Widgets.FindWidget.destroy","AbstractMode","AbstractMode.constructor","AbstractMode.getInitialState","Sample.Thing.Languages","Sample.Thing.Languages.PlainText","Sample.Thing.Languages.PlainText.State","Sample.Thing.Languages.PlainText.State.constructor","Sample.Thing.Languages.PlainText.State.clone","Sample.Thing.Languages.PlainText.State.equals","Sample.Thing.Languages.PlainText.State.getMode","Sample.Thing.Languages.PlainText.Mode","Sample.Thing.Languages.PlainText.Mode.constructor","Sample.Thing.Languages.PlainText.Mode.getInitialState"],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAACA,IAAAA,OAAOA,CAUpBA;IAVaA,WAAAA,OAAOA;QAACC,IAAAA,KAAKA,CAU1BA;QAVqBA,WAAAA,MAAKA;YAACC,IAAAA,IAAIA,CAU/BA;YAV2BA,WAAAA,IAAIA,EAACA,CAACA;gBACjCC,IAAaA,eAAeA;oBAA5BC,SAAaA,eAAeA;oBAQ5BC,CAACA;oBANOD,+BAAKA,GAAZA;wBAAiBE,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBAExBF,6BAAGA,GAAVA,UAAWA,KAA6BA;wBAEvCG,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBACFH,sBAACA;gBAADA,CAACA,AARDD,IAQCA;gBARYA,oBAAeA,GAAfA,eAQZA,CAAAA;YACFA,CAACA,EAV2BD,IAAIA,GAAJA,WAAIA,KAAJA,WAAIA,QAU/BA;QAADA,CAACA,EAVqBD,KAAKA,GAALA,aAAKA,KAALA,aAAKA,QAU1BA;IAADA,CAACA,EAVaD,OAAOA,GAAPA,cAAOA,KAAPA,cAAOA,QAUpBA;AAADA,CAACA,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAACA,IAAAA,KAAKA,CAoBlBA;IApBaA,WAAAA,KAAKA;QAACQ,IAAAA,OAAOA,CAoB1BA;QApBmBA,WAAAA,OAAOA,EAACA,CAACA;YAC5BC,IAAaA,UAAUA;gBAKtBC,SALYA,UAAUA,CAKFA,SAAkCA;oBAAlCC,cAASA,GAATA,SAASA,CAAyBA;oBAD9CA,YAAOA,GAAOA,IAAIA,CAACA;oBAEvBA,aAAaA;oBACbA,SAASA,CAACA,SAASA,CAACA,WAAWA,EAAEA,IAAIA,CAACA,CAACA;gBAC3CA,CAACA;gBANMD,wBAAGA,GAAVA,UAAWA,MAAyCA;oBAAIE,EAAEA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA;wBAAAA,MAAMA,CAACA,MAAMA,CAACA,IAAIA,CAACA,CAACA;oBAAAA,CAACA;gBAAAA,CAACA;gBAQlFF,+BAAUA,GAAjBA;oBACCG,MAAMA,CAACA,OAAOA,CAACA;gBAChBA,CAACA;gBAEMH,4BAAOA,GAAdA;gBAEAI,CAACA;gBAEFJ,iBAACA;YAADA,CAACA,AAlBDD,IAkBCA;YAlBYA,kBAAUA,GAAVA,UAkBZA,CAAAA;QACFA,CAACA,EApBmBD,OAAOA,GAAPA,aAAOA,KAAPA,aAAOA,QAoB1BA;IAADA,CAACA,EApBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAoBlBA;AAADA,CAACA,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD,IAAM,YAAY;IAAlBe,SAAMA,YAAYA;IAAqEC,CAACA;IAA3CD,sCAAeA,GAAtBA;QAAmCE,MAAMA,CAACA,IAAIA,CAACA;IAAAA,CAACA;IAACF,mBAACA;AAADA,CAACA,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAACf,IAAAA,KAAKA,CAwBlBA;IAxBaA,WAAAA,KAAKA;QAACQ,IAAAA,SAASA,CAwB5BA;QAxBmBA,WAAAA,SAASA;YAACU,IAAAA,SAASA,CAwBtCA;YAxB6BA,WAAAA,SAASA,EAACA,CAACA;gBAExCC,IAAaA,KAAKA;oBACXC,SADMA,KAAKA,CACSA,IAAWA;wBAAXC,SAAIA,GAAJA,IAAIA,CAAOA;oBAAIA,CAACA;oBACnCD,qBAAKA,GAAZA;wBACCE,MAAMA,CAACA,IAAIA,CAACA;oBACbA,CAACA;oBAEMF,sBAAMA,GAAbA,UAAcA,KAAYA;wBACzBG,MAAMA,CAACA,IAAIA,KAAKA,KAAKA,CAACA;oBACvBA,CAACA;oBAEMH,uBAAOA,GAAdA;wBAA0BI,MAAMA,CAACA,IAAIA,CAACA;oBAACA,CAACA;oBACzCJ,YAACA;gBAADA,CAACA,AAXDD,IAWCA;gBAXYA,eAAKA,GAALA,KAWZA,CAAAA;gBAEDA,IAAaA,IAAIA;oBAASM,UAAbA,IAAIA,UAAqBA;oBAAtCA,SAAaA,IAAIA;wBAASC,8BAAYA;oBAQtCA,CAACA;oBANAD,aAAaA;oBACNA,8BAAeA,GAAtBA;wBACCE,MAAMA,CAACA,IAAIA,KAAKA,CAACA,IAAIA,CAACA,CAACA;oBACxBA,CAACA;oBAGFF,WAACA;gBAADA,CAACA,AARDN,EAA0BA,YAAYA,EAQrCA;gBARYA,cAAIA,GAAJA,IAQZA,CAAAA;YACFA,CAACA,EAxB6BD,SAASA,GAATA,mBAASA,KAATA,mBAASA,QAwBtCA;QAADA,CAACA,EAxBmBV,SAASA,GAATA,eAASA,KAATA,eAASA,QAwB5BA;IAADA,CAACA,EAxBaR,KAAKA,GAALA,YAAKA,KAALA,YAAKA,QAwBlBA;AAADA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
index d7163bf7760f2..2429c6cb9d819 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -775,18 +775,14 @@ sourceFile:recursiveClassReferenceTest.ts
 ---
 >>>                    // scenario 1
 1 >^^^^^^^^^^^^^^^^^^^^
-2 >                    
-3 >                    ^^^^^^^^^^^^^
-4 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >                    ^^^^^^^^^^^^^
+3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >		constructor(private codeThing: Sample.Thing.ICodeThing) {
-  >		    // scenario 1
   >		    
-2 >                    
-3 >                    // scenario 1
-1 >Emitted(43, 21) Source(52, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor)
-2 >Emitted(43, 21) Source(51, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor)
-3 >Emitted(43, 34) Source(51, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor)
+2 >                    // scenario 1
+1 >Emitted(43, 21) Source(51, 7) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor)
+2 >Emitted(43, 34) Source(51, 20) + SourceIndex(0) name (Sample.Thing.Widgets.FindWidget.constructor)
 ---
 >>>                    codeThing.addWidget("addWidget", this);
 1->^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js.map b/tests/baselines/reference/sourceMap-FileWithComments.js.map
index 7405d21eb8509..037da85d6a912 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.js.map
+++ b/tests/baselines/reference/sourceMap-FileWithComments.js.map
@@ -1,2 +1,2 @@
 //// [sourceMap-FileWithComments.js.map]
-{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist","Shapes.foo"],"mappings":"AAOA,AADA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAGXA,AADAA,QAAQA;QACKA,KAAKA;QACdC,cAAcA;QACdA,SAFSA,KAAKA,CAEKA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA;YAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA;QAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,GAALA,KASZA,CAAAA;IAGDA,AADAA,+BAA+BA;QAC3BA,CAACA,GAAGA,EAAEA,CAACA;IAEXA,SAAgBA,GAAGA;IACnBI,CAACA;IADeJ,UAAGA,GAAHA,GACfA,CAAAA;IAKDA,AAHAA;;MAEEA;QACEA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAGD,AADA,qBAAqB;IACjB,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"}
\ No newline at end of file
+{"version":3,"file":"sourceMap-FileWithComments.js","sourceRoot":"","sources":["sourceMap-FileWithComments.ts"],"names":["Shapes","Shapes.Point","Shapes.Point.constructor","Shapes.Point.getDist","Shapes.foo"],"mappings":"AAMA,SAAS;AACT,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM,EAAC,CAAC;IAEXA,QAAQA;IACRA,IAAaA,KAAKA;QACdC,cAAcA;QACdA,SAFSA,KAAKA,CAEKA,CAASA,EAASA,CAASA;YAA3BC,MAACA,GAADA,CAACA,CAAQA;YAASA,MAACA,GAADA,CAACA,CAAQA;QAAIA,CAACA;QAEnDD,kBAAkBA;QAClBA,uBAAOA,GAAPA;YAAYE,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,GAAGA,IAAIA,CAACA,CAACA,CAACA,CAACA;QAACA,CAACA;QAElEF,gBAAgBA;QACTA,YAAMA,GAAGA,IAAIA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACpCA,YAACA;IAADA,CAACA,AATDD,IASCA;IATYA,YAAKA,GAALA,KASZA,CAAAA;IAEDA,+BAA+BA;IAC/BA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IAEXA,SAAgBA,GAAGA;IACnBI,CAACA;IADeJ,UAAGA,GAAHA,GACfA,CAAAA;IAEDA;;MAEEA;IACFA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;AACfA,CAACA,EAxBM,MAAM,KAAN,MAAM,QAwBZ;AAED,qBAAqB;AACrB,IAAI,CAAC,GAAW,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
index 8dc11688ab065..74e57f9307471 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
@@ -10,22 +10,18 @@ sourceFile:sourceMap-FileWithComments.ts
 -------------------------------------------------------------------
 >>>// Module
 1 >
-2 >
-3 >^^^^^^^^^
-4 >         ^^^->
+2 >^^^^^^^^^
+3 >         ^^^->
 1 >
   >// Interface
   >interface IPoint {
   >    getDist(): number;
   >}
   >
-  >// Module
   >
-2 >
-3 >// Module
-1 >Emitted(1, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(7, 1) + SourceIndex(0)
-3 >Emitted(1, 10) Source(7, 10) + SourceIndex(0)
+2 >// Module
+1 >Emitted(1, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(1, 10) Source(7, 10) + SourceIndex(0)
 ---
 >>>var Shapes;
 1->
@@ -86,28 +82,27 @@ sourceFile:sourceMap-FileWithComments.ts
 ---
 >>>    // Class
 1 >^^^^
-2 >    
-3 >    ^^^^^^^^
-4 >            ^^^^^^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^
+3 >            ^^^^^^^^^^^^^^^^^^^->
 1 >
   >
-  >    // Class
   >    
-2 >    
-3 >    // Class
-1 >Emitted(4, 5) Source(11, 5) + SourceIndex(0) name (Shapes)
-2 >Emitted(4, 5) Source(10, 5) + SourceIndex(0) name (Shapes)
-3 >Emitted(4, 13) Source(10, 13) + SourceIndex(0) name (Shapes)
+2 >    // Class
+1 >Emitted(4, 5) Source(10, 5) + SourceIndex(0) name (Shapes)
+2 >Emitted(4, 13) Source(10, 13) + SourceIndex(0) name (Shapes)
 ---
 >>>    var Point = (function () {
-1->^^^^^^^^
-2 >        ^^^^^
-3 >             ^^^^^^^^^^->
+1->^^^^
+2 >    ^^^^
+3 >        ^^^^^
+4 >             ^^^^^^^^^^->
 1->
-  >    export class 
-2 >        Point
-1->Emitted(5, 9) Source(11, 18) + SourceIndex(0) name (Shapes)
-2 >Emitted(5, 14) Source(11, 23) + SourceIndex(0) name (Shapes)
+  >    
+2 >    export class 
+3 >        Point
+1->Emitted(5, 5) Source(11, 5) + SourceIndex(0) name (Shapes)
+2 >Emitted(5, 9) Source(11, 18) + SourceIndex(0) name (Shapes)
+3 >Emitted(5, 14) Source(11, 23) + SourceIndex(0) name (Shapes)
 ---
 >>>        // Constructor
 1->^^^^^^^^
@@ -405,36 +400,35 @@ sourceFile:sourceMap-FileWithComments.ts
 ---
 >>>    // Variable comment after class
 1->^^^^
-2 >    
-3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
-  >    // Variable comment after class
   >    
-2 >    
-3 >    // Variable comment after class
-1->Emitted(20, 5) Source(23, 5) + SourceIndex(0) name (Shapes)
-2 >Emitted(20, 5) Source(22, 5) + SourceIndex(0) name (Shapes)
-3 >Emitted(20, 36) Source(22, 36) + SourceIndex(0) name (Shapes)
+2 >    // Variable comment after class
+1->Emitted(20, 5) Source(22, 5) + SourceIndex(0) name (Shapes)
+2 >Emitted(20, 36) Source(22, 36) + SourceIndex(0) name (Shapes)
 ---
 >>>    var a = 10;
-1 >^^^^^^^^
-2 >        ^
-3 >         ^^^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^^->
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^^
+6 >              ^
+7 >               ^^^^^^->
 1 >
-  >    var 
-2 >        a
-3 >          = 
-4 >            10
-5 >              ;
-1 >Emitted(21, 9) Source(23, 9) + SourceIndex(0) name (Shapes)
-2 >Emitted(21, 10) Source(23, 10) + SourceIndex(0) name (Shapes)
-3 >Emitted(21, 13) Source(23, 13) + SourceIndex(0) name (Shapes)
-4 >Emitted(21, 15) Source(23, 15) + SourceIndex(0) name (Shapes)
-5 >Emitted(21, 16) Source(23, 16) + SourceIndex(0) name (Shapes)
+  >    
+2 >    var 
+3 >        a
+4 >          = 
+5 >            10
+6 >              ;
+1 >Emitted(21, 5) Source(23, 5) + SourceIndex(0) name (Shapes)
+2 >Emitted(21, 9) Source(23, 9) + SourceIndex(0) name (Shapes)
+3 >Emitted(21, 10) Source(23, 10) + SourceIndex(0) name (Shapes)
+4 >Emitted(21, 13) Source(23, 13) + SourceIndex(0) name (Shapes)
+5 >Emitted(21, 15) Source(23, 15) + SourceIndex(0) name (Shapes)
+6 >Emitted(21, 16) Source(23, 16) + SourceIndex(0) name (Shapes)
 ---
 >>>    function foo() {
 1->^^^^
@@ -480,17 +474,11 @@ sourceFile:sourceMap-FileWithComments.ts
 ---
 >>>    /**  comment after function
 1->^^^^
-2 >    
-3 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-  >    /**  comment after function
-  >    * this is another comment 
-  >    */
   >    
-2 >    
-1->Emitted(25, 5) Source(31, 5) + SourceIndex(0) name (Shapes)
-2 >Emitted(25, 5) Source(28, 5) + SourceIndex(0) name (Shapes)
+1->Emitted(25, 5) Source(28, 5) + SourceIndex(0) name (Shapes)
 ---
 >>>    * this is another comment
 >>>    */
@@ -502,23 +490,26 @@ sourceFile:sourceMap-FileWithComments.ts
 1->Emitted(27, 7) Source(30, 7) + SourceIndex(0) name (Shapes)
 ---
 >>>    var b = 10;
-1->^^^^^^^^
-2 >        ^
-3 >         ^^^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^^^^^^^^^^->
+1->^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^^
+6 >              ^
+7 >               ^^^^^^^^^^^^^^->
 1->
-  >    var 
-2 >        b
-3 >          = 
-4 >            10
-5 >              ;
-1->Emitted(28, 9) Source(31, 9) + SourceIndex(0) name (Shapes)
-2 >Emitted(28, 10) Source(31, 10) + SourceIndex(0) name (Shapes)
-3 >Emitted(28, 13) Source(31, 13) + SourceIndex(0) name (Shapes)
-4 >Emitted(28, 15) Source(31, 15) + SourceIndex(0) name (Shapes)
-5 >Emitted(28, 16) Source(31, 16) + SourceIndex(0) name (Shapes)
+  >    
+2 >    var 
+3 >        b
+4 >          = 
+5 >            10
+6 >              ;
+1->Emitted(28, 5) Source(31, 5) + SourceIndex(0) name (Shapes)
+2 >Emitted(28, 9) Source(31, 9) + SourceIndex(0) name (Shapes)
+3 >Emitted(28, 10) Source(31, 10) + SourceIndex(0) name (Shapes)
+4 >Emitted(28, 13) Source(31, 13) + SourceIndex(0) name (Shapes)
+5 >Emitted(28, 15) Source(31, 15) + SourceIndex(0) name (Shapes)
+6 >Emitted(28, 16) Source(31, 16) + SourceIndex(0) name (Shapes)
 ---
 >>>})(Shapes || (Shapes = {}));
 1->
@@ -570,60 +561,59 @@ sourceFile:sourceMap-FileWithComments.ts
 ---
 >>>/** Local Variable */
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^
-4 >                     ^^^^^^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^^^
+3 >                     ^^^^^^^^^^^->
 1 >
   >
-  >/** Local Variable */
   >
-2 >
-3 >/** Local Variable */
-1 >Emitted(30, 1) Source(35, 1) + SourceIndex(0)
-2 >Emitted(30, 1) Source(34, 1) + SourceIndex(0)
-3 >Emitted(30, 22) Source(34, 22) + SourceIndex(0)
+2 >/** Local Variable */
+1 >Emitted(30, 1) Source(34, 1) + SourceIndex(0)
+2 >Emitted(30, 22) Source(34, 22) + SourceIndex(0)
 ---
 >>>var p = new Shapes.Point(3, 4);
-1->^^^^
-2 >    ^
-3 >     ^^^
-4 >        ^^^^
-5 >            ^^^^^^
-6 >                  ^
-7 >                   ^^^^^
-8 >                        ^
-9 >                         ^
-10>                          ^^
-11>                            ^
-12>                             ^
-13>                              ^
+1->
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^^^
+6 >            ^^^^^^
+7 >                  ^
+8 >                   ^^^^^
+9 >                        ^
+10>                         ^
+11>                          ^^
+12>                            ^
+13>                             ^
+14>                              ^
 1->
-  >var 
-2 >    p
-3 >     : IPoint = 
-4 >        new 
-5 >            Shapes
-6 >                  .
-7 >                   Point
-8 >                        (
-9 >                         3
-10>                          , 
-11>                            4
-12>                             )
-13>                              ;
-1->Emitted(31, 5) Source(35, 5) + SourceIndex(0)
-2 >Emitted(31, 6) Source(35, 6) + SourceIndex(0)
-3 >Emitted(31, 9) Source(35, 17) + SourceIndex(0)
-4 >Emitted(31, 13) Source(35, 21) + SourceIndex(0)
-5 >Emitted(31, 19) Source(35, 27) + SourceIndex(0)
-6 >Emitted(31, 20) Source(35, 28) + SourceIndex(0)
-7 >Emitted(31, 25) Source(35, 33) + SourceIndex(0)
-8 >Emitted(31, 26) Source(35, 34) + SourceIndex(0)
-9 >Emitted(31, 27) Source(35, 35) + SourceIndex(0)
-10>Emitted(31, 29) Source(35, 37) + SourceIndex(0)
-11>Emitted(31, 30) Source(35, 38) + SourceIndex(0)
-12>Emitted(31, 31) Source(35, 39) + SourceIndex(0)
-13>Emitted(31, 32) Source(35, 40) + SourceIndex(0)
+  >
+2 >var 
+3 >    p
+4 >     : IPoint = 
+5 >        new 
+6 >            Shapes
+7 >                  .
+8 >                   Point
+9 >                        (
+10>                         3
+11>                          , 
+12>                            4
+13>                             )
+14>                              ;
+1->Emitted(31, 1) Source(35, 1) + SourceIndex(0)
+2 >Emitted(31, 5) Source(35, 5) + SourceIndex(0)
+3 >Emitted(31, 6) Source(35, 6) + SourceIndex(0)
+4 >Emitted(31, 9) Source(35, 17) + SourceIndex(0)
+5 >Emitted(31, 13) Source(35, 21) + SourceIndex(0)
+6 >Emitted(31, 19) Source(35, 27) + SourceIndex(0)
+7 >Emitted(31, 20) Source(35, 28) + SourceIndex(0)
+8 >Emitted(31, 25) Source(35, 33) + SourceIndex(0)
+9 >Emitted(31, 26) Source(35, 34) + SourceIndex(0)
+10>Emitted(31, 27) Source(35, 35) + SourceIndex(0)
+11>Emitted(31, 29) Source(35, 37) + SourceIndex(0)
+12>Emitted(31, 30) Source(35, 38) + SourceIndex(0)
+13>Emitted(31, 31) Source(35, 39) + SourceIndex(0)
+14>Emitted(31, 32) Source(35, 40) + SourceIndex(0)
 ---
 >>>var dist = p.getDist();
 1 >
diff --git a/tests/baselines/reference/sourceMapSample.js.map b/tests/baselines/reference/sourceMapSample.js.map
index 78a59c1b6c182..d8f99571b56f5 100644
--- a/tests/baselines/reference/sourceMapSample.js.map
+++ b/tests/baselines/reference/sourceMapSample.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapSample.js.map]
-{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAkCbA;IAlCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,uBAA0BA;iBAA1BA,WAA0BA,CAA1BA,sBAA0BA,CAA1BA,IAA0BA;gBAA1BA,sCAA0BA;;YACtDA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAlCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAkCbA;AAADA,CAACA,EAlCM,GAAG,KAAH,GAAG,QAkCT"}
\ No newline at end of file
+{"version":3,"file":"sourceMapSample.js","sourceRoot":"","sources":["sourceMapSample.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAkCT;AAlCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAkCbA;IAlCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,IAAGA,aAAaA,MAAUA;iBAA1BA,WAA0BA,CAA1BA,sBAA0BA,CAA1BA,IAA0BA;gBAA1BA,sCAA0BA;;YACtDA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAlCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAkCbA;AAADA,CAACA,EAlCM,GAAG,KAAH,GAAG,QAkCT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt
index 218dfb1c15228..a85af56e6445c 100644
--- a/tests/baselines/reference/sourceMapSample.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt
@@ -447,12 +447,18 @@ sourceFile:sourceMapSample.ts
 ---
 >>>            var restGreetings = [];
 1->^^^^^^^^^^^^
-2 >            ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >            ^^^^
+3 >                ^^^^^^^^^^^^^
+4 >                             ^^^^^^
+5 >                                   ^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->, 
-2 >            ...restGreetings: string[]
+2 >            ...
+3 >                restGreetings
+4 >                             : string[]
 1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2)
-2 >Emitted(21, 36) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2)
+2 >Emitted(21, 17) Source(21, 40) + SourceIndex(0) name (Foo.Bar.foo2)
+3 >Emitted(21, 30) Source(21, 53) + SourceIndex(0) name (Foo.Bar.foo2)
+4 >Emitted(21, 36) Source(21, 63) + SourceIndex(0) name (Foo.Bar.foo2)
 ---
 >>>            for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map
index 661459022b1d6..5eaf7787915a3 100644
--- a/tests/baselines/reference/sourceMapValidationClass.js.map
+++ b/tests/baselines/reference/sourceMapValidationClass.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClass.js.map]
-{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA,IAAM,OAAO;IACTA,SADEA,OAAOA,CACUA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA,IAAM,OAAO;IACTA,SADEA,OAAOA,CACUA,QAAgBA;QAAEC,IAAGA,CAACA,MAAUA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
index 1c80abde32e90..2ec5747365fed 100644
--- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
@@ -41,12 +41,18 @@ sourceFile:sourceMapValidationClass.ts
 ---
 >>>        var b = [];
 1 >^^^^^^^^
-2 >        ^^^^^^^^^^^
-3 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >        ^^^^
+3 >            ^
+4 >             ^^^^^^
+5 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >, 
-2 >        ...b: string[]
+2 >        ...
+3 >            b
+4 >             : string[]
 1 >Emitted(3, 9) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(3, 13) Source(2, 45) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(3, 14) Source(2, 46) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
 ---
 >>>        for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js
index e3b705bc4b025..13c75cf3fac07 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.js
+++ b/tests/baselines/reference/sourceMapValidationClasses.js
@@ -59,7 +59,7 @@ var Foo;
         function foo2(greeting) {
             var restGreetings /* more greeting */ = [];
             for (var _i = 1; _i < arguments.length; _i++) {
-                restGreetings /* more greeting */[_i - 1] = arguments[_i];
+                restGreetings[_i - 1] = arguments[_i];
             }
             var greeters = []; /* inline block comment */
             greeters[0] = new Greeter(greeting);
diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map
index 68ded9631e2e9..d3045e43b5f14 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.js.map
+++ b/tests/baselines/reference/sourceMapValidationClasses.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClasses.js.map]
-{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAmCbA;IAnCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,kBAAiBA,mBAAmBA,MAAUA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,cAAiBA,mBAAmBA,yBAAUA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,EAAEA,0BAA0BA,AAA3BA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QAEpCA,AADAA,qCAAqCA;QACrCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAmCbA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,IAAAA,GAAGA,CAmCbA;IAnCUA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,IAAGA,aAAaA,CAACA,mBAAmBA,MAAUA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,sCAA8CA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,CAACA,CAACA,0BAA0BA;YACxDA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QACpCA,qCAAqCA;QACrCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,GAAGA,GAAHA,OAAGA,KAAHA,OAAGA,QAmCbA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
index 6cd77b696fffc..91ed933292dd3 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
@@ -449,18 +449,24 @@ sourceFile:sourceMapValidationClasses.ts
 ---
 >>>            var restGreetings /* more greeting */ = [];
 1->^^^^^^^^^^^^
-2 >            ^^^^^^^^^^^^^^^^^^
-3 >                              ^^^^^^^^^^^^^^^^^^^
-4 >                                                 ^^^^^^
-5 >                                                       ^^^^^->
+2 >            ^^^^
+3 >                ^^^^^^^^^^^^^
+4 >                             ^
+5 >                              ^^^^^^^^^^^^^^^^^^^
+6 >                                                 ^^^^^^
+7 >                                                       ^^^^^->
 1->, 
-2 >            ...restGreetings 
-3 >                              /* more greeting */
-4 >                                                 : string[]
+2 >            ...
+3 >                restGreetings
+4 >                              
+5 >                              /* more greeting */
+6 >                                                 : string[]
 1->Emitted(21, 13) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2)
-2 >Emitted(21, 31) Source(21, 54) + SourceIndex(0) name (Foo.Bar.foo2)
-3 >Emitted(21, 50) Source(21, 73) + SourceIndex(0) name (Foo.Bar.foo2)
-4 >Emitted(21, 56) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2)
+2 >Emitted(21, 17) Source(21, 40) + SourceIndex(0) name (Foo.Bar.foo2)
+3 >Emitted(21, 30) Source(21, 53) + SourceIndex(0) name (Foo.Bar.foo2)
+4 >Emitted(21, 31) Source(21, 54) + SourceIndex(0) name (Foo.Bar.foo2)
+5 >Emitted(21, 50) Source(21, 73) + SourceIndex(0) name (Foo.Bar.foo2)
+6 >Emitted(21, 56) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2)
 ---
 >>>            for (var _i = 1; _i < arguments.length; _i++) {
 1->^^^^^^^^^^^^^^^^^
@@ -469,7 +475,6 @@ sourceFile:sourceMapValidationClasses.ts
 4 >                             ^^^^^^^^^^^^^^^^^^^^^^
 5 >                                                   ^
 6 >                                                    ^^^^
-7 >                                                        ^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                 ...restGreetings /* more greeting */: string[]
 3 >                            
@@ -483,19 +488,13 @@ sourceFile:sourceMapValidationClasses.ts
 5 >Emitted(22, 53) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2)
 6 >Emitted(22, 57) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2)
 ---
->>>                restGreetings /* more greeting */[_i - 1] = arguments[_i];
-1->^^^^^^^^^^^^^^^^
-2 >                ^^^^^^^^^^^^^^
-3 >                              ^^^^^^^^^^^^^^^^^^^
-4 >                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-2 >                ...restGreetings 
-3 >                              /* more greeting */
-4 >                                                 : string[]
-1->Emitted(23, 17) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2)
-2 >Emitted(23, 31) Source(21, 54) + SourceIndex(0) name (Foo.Bar.foo2)
-3 >Emitted(23, 50) Source(21, 73) + SourceIndex(0) name (Foo.Bar.foo2)
-4 >Emitted(23, 75) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2)
+>>>                restGreetings[_i - 1] = arguments[_i];
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >                ...restGreetings /* more greeting */: string[]
+1 >Emitted(23, 17) Source(21, 37) + SourceIndex(0) name (Foo.Bar.foo2)
+2 >Emitted(23, 55) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2)
 ---
 >>>            }
 >>>            var greeters = []; /* inline block comment */
@@ -504,26 +503,26 @@ sourceFile:sourceMapValidationClasses.ts
 3 >                ^^^^^^^^
 4 >                        ^^^
 5 >                           ^^
-6 >                             ^^
-7 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
-8 >                                                         
+6 >                             ^
+7 >                              ^
+8 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >) {
   >        
 2 >            var 
 3 >                greeters
 4 >                        : Greeter[] = 
 5 >                           []
-6 >                             ; 
-7 >                               /* inline block comment */
-8 >                                                         
+6 >                             ;
+7 >                               
+8 >                               /* inline block comment */
 1 >Emitted(25, 13) Source(22, 9) + SourceIndex(0) name (Foo.Bar.foo2)
 2 >Emitted(25, 17) Source(22, 13) + SourceIndex(0) name (Foo.Bar.foo2)
 3 >Emitted(25, 25) Source(22, 21) + SourceIndex(0) name (Foo.Bar.foo2)
 4 >Emitted(25, 28) Source(22, 35) + SourceIndex(0) name (Foo.Bar.foo2)
 5 >Emitted(25, 30) Source(22, 37) + SourceIndex(0) name (Foo.Bar.foo2)
-6 >Emitted(25, 32) Source(22, 39) + SourceIndex(0) name (Foo.Bar.foo2)
-7 >Emitted(25, 58) Source(22, 65) + SourceIndex(0) name (Foo.Bar.foo2)
-8 >Emitted(25, 58) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2)
+6 >Emitted(25, 31) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2)
+7 >Emitted(25, 32) Source(22, 39) + SourceIndex(0) name (Foo.Bar.foo2)
+8 >Emitted(25, 58) Source(22, 65) + SourceIndex(0) name (Foo.Bar.foo2)
 ---
 >>>            greeters[0] = new Greeter(greeting);
 1 >^^^^^^^^^^^^
@@ -539,7 +538,7 @@ sourceFile:sourceMapValidationClasses.ts
 11>                                              ^
 12>                                               ^
 13>                                                ^^^^^^^^^^^^^->
-1 > /* inline block comment */
+1 >
   >        
 2 >            greeters
 3 >                    [
@@ -762,16 +761,12 @@ sourceFile:sourceMapValidationClasses.ts
 ---
 >>>        // This is simple signle line comment
 1->^^^^^^^^
-2 >        
-3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-  >    // This is simple signle line comment
   >    
-2 >        
-3 >        // This is simple signle line comment
-1->Emitted(33, 9) Source(33, 5) + SourceIndex(0) name (Foo.Bar)
-2 >Emitted(33, 9) Source(32, 5) + SourceIndex(0) name (Foo.Bar)
-3 >Emitted(33, 46) Source(32, 42) + SourceIndex(0) name (Foo.Bar)
+2 >        // This is simple signle line comment
+1->Emitted(33, 9) Source(32, 5) + SourceIndex(0) name (Foo.Bar)
+2 >Emitted(33, 46) Source(32, 42) + SourceIndex(0) name (Foo.Bar)
 ---
 >>>        for (var j = 0; j < b.length; j++) {
 1 >^^^^^^^^
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.js.map b/tests/baselines/reference/sourceMapValidationFunctions.js.map
index c04ec524d2db5..23c4aaadc82fb 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.js.map
+++ b/tests/baselines/reference/sourceMapValidationFunctions.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationFunctions.js.map]
-{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":["greet","greet2","foo"],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,SAAS,KAAK,CAAC,QAAgB;IAC3BA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,MAAM,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IACzEA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,GAAG,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,MAAMA;IAAcA,oBAAuBA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IAEtEA,MAAMA,CAACA;AACXA,CAACA"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationFunctions.js","sourceRoot":"","sources":["sourceMapValidationFunctions.ts"],"names":["greet","greet2","foo"],"mappings":"AAAA,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,SAAS,KAAK,CAAC,QAAgB;IAC3BA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,MAAM,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,CAACA,GAAGA,EAAEA;IAAcA,IAAGA,UAAUA,MAAUA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IACzEA,SAASA,EAAEA,CAACA;IACZA,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA;AACD,SAAS,GAAG,CAAC,QAAgB,EAAE,CAAM,EAAE,CAAU;IAAlBC,iBAAMA,GAANA,CAACA,GAAGA,EAAEA;IAAcA,IAAGA,UAAUA,MAAUA;SAAvBA,WAAuBA,CAAvBA,sBAAuBA,CAAvBA,IAAuBA;QAAvBA,mCAAuBA;;IAEtEA,MAAMA,CAACA;AACXA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
index a9e43e404a747..854d4562b6e95 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationFunctions.sourcemap.txt
@@ -126,24 +126,36 @@ sourceFile:sourceMapValidationFunctions.ts
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^
 3 >                     ^^^
-4 >                        ^^^^^^
+4 >                        ^
+5 >                         ^^^
+6 >                            ^^
 1->
 2 >    n = 10
 3 >                     
-4 >                        n = 10
+4 >                        n
+5 >                          = 
+6 >                            10
 1->Emitted(7, 5) Source(6, 35) + SourceIndex(0) name (greet2)
 2 >Emitted(7, 22) Source(6, 41) + SourceIndex(0) name (greet2)
 3 >Emitted(7, 25) Source(6, 35) + SourceIndex(0) name (greet2)
-4 >Emitted(7, 31) Source(6, 41) + SourceIndex(0) name (greet2)
+4 >Emitted(7, 26) Source(6, 36) + SourceIndex(0) name (greet2)
+5 >Emitted(7, 29) Source(6, 39) + SourceIndex(0) name (greet2)
+6 >Emitted(7, 31) Source(6, 41) + SourceIndex(0) name (greet2)
 ---
 >>>    var restParams = [];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >    ^^^^
+3 >        ^^^^^^^^^^
+4 >                  ^^^^^^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >, x?: string, 
-2 >    ...restParams: string[]
+2 >    ...
+3 >        restParams
+4 >                  : string[]
 1 >Emitted(8, 5) Source(6, 55) + SourceIndex(0) name (greet2)
-2 >Emitted(8, 25) Source(6, 78) + SourceIndex(0) name (greet2)
+2 >Emitted(8, 9) Source(6, 58) + SourceIndex(0) name (greet2)
+3 >Emitted(8, 19) Source(6, 68) + SourceIndex(0) name (greet2)
+4 >Emitted(8, 25) Source(6, 78) + SourceIndex(0) name (greet2)
 ---
 >>>    for (var _i = 3; _i < arguments.length; _i++) {
 1->^^^^^^^^^
@@ -253,24 +265,36 @@ sourceFile:sourceMapValidationFunctions.ts
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^
 3 >                     ^^^
-4 >                        ^^^^^^
+4 >                        ^
+5 >                         ^^^
+6 >                            ^^
 1->
 2 >    n = 10
 3 >                     
-4 >                        n = 10
+4 >                        n
+5 >                          = 
+6 >                            10
 1->Emitted(16, 5) Source(10, 32) + SourceIndex(0) name (foo)
 2 >Emitted(16, 22) Source(10, 38) + SourceIndex(0) name (foo)
 3 >Emitted(16, 25) Source(10, 32) + SourceIndex(0) name (foo)
-4 >Emitted(16, 31) Source(10, 38) + SourceIndex(0) name (foo)
+4 >Emitted(16, 26) Source(10, 33) + SourceIndex(0) name (foo)
+5 >Emitted(16, 29) Source(10, 36) + SourceIndex(0) name (foo)
+6 >Emitted(16, 31) Source(10, 38) + SourceIndex(0) name (foo)
 ---
 >>>    var restParams = [];
 1 >^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 >    ^^^^
+3 >        ^^^^^^^^^^
+4 >                  ^^^^^^
+5 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >, x?: string, 
-2 >    ...restParams: string[]
+2 >    ...
+3 >        restParams
+4 >                  : string[]
 1 >Emitted(17, 5) Source(10, 52) + SourceIndex(0) name (foo)
-2 >Emitted(17, 25) Source(10, 75) + SourceIndex(0) name (foo)
+2 >Emitted(17, 9) Source(10, 55) + SourceIndex(0) name (foo)
+3 >Emitted(17, 19) Source(10, 65) + SourceIndex(0) name (foo)
+4 >Emitted(17, 25) Source(10, 75) + SourceIndex(0) name (foo)
 ---
 >>>    for (var _i = 3; _i < arguments.length; _i++) {
 1->^^^^^^^^^
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.js.map b/tests/baselines/reference/sourceMapValidationWithComments.js.map
index 75563cf9b95d2..47896ff3c2c89 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.js.map
+++ b/tests/baselines/reference/sourceMapValidationWithComments.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationWithComments.js.map]
-{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":["DebugClass","DebugClass.constructor","DebugClass.debugFunc"],"mappings":"AAAA,IAAM,UAAU;IAAhBA,SAAMA,UAAUA;IAoBhBC,CAACA;IAlBiBD,oBAASA,GAAvBA;QAGIE,AADAA,2BAA2BA;YACvBA,CAACA,GAAGA,CAACA,CAACA;QACVA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QAIJA,AAHAA,yBAAyBA;QAGzBA,MAAMA,CAACA,IAAIA,CAACA;IAChBA,CAACA;IACLF,iBAACA;AAADA,CAACA,AApBD,IAoBC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationWithComments.js","sourceRoot":"","sources":["sourceMapValidationWithComments.ts"],"names":["DebugClass","DebugClass.constructor","DebugClass.debugFunc"],"mappings":"AAAA,IAAM,UAAU;IAAhBA,SAAMA,UAAUA;IAoBhBC,CAACA;IAlBiBD,oBAASA,GAAvBA;QAEIE,2BAA2BA;QAC3BA,IAAIA,CAACA,GAAGA,CAACA,CAACA;QACVA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,CAACA;QACJA,yBAAyBA;QAGzBA,MAAMA,CAACA,IAAIA,CAACA;IAChBA,CAACA;IACLF,iBAACA;AAADA,CAACA,AApBD,IAoBC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
index 929091139f767..1104b759d4cc8 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
@@ -74,35 +74,34 @@ sourceFile:sourceMapValidationWithComments.ts
 ---
 >>>        // Start Debugger Test Code
 1->^^^^^^^^
-2 >        
-3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->public static debugFunc() {
   >
-  >        // Start Debugger Test Code
   >        
-2 >        
-3 >        // Start Debugger Test Code
-1->Emitted(5, 9) Source(6, 9) + SourceIndex(0) name (DebugClass.debugFunc)
-2 >Emitted(5, 9) Source(5, 9) + SourceIndex(0) name (DebugClass.debugFunc)
-3 >Emitted(5, 36) Source(5, 36) + SourceIndex(0) name (DebugClass.debugFunc)
+2 >        // Start Debugger Test Code
+1->Emitted(5, 9) Source(5, 9) + SourceIndex(0) name (DebugClass.debugFunc)
+2 >Emitted(5, 36) Source(5, 36) + SourceIndex(0) name (DebugClass.debugFunc)
 ---
 >>>        var i = 0;
-1 >^^^^^^^^^^^^
-2 >            ^
-3 >             ^^^
-4 >                ^
-5 >                 ^
+1 >^^^^^^^^
+2 >        ^^^^
+3 >            ^
+4 >             ^^^
+5 >                ^
+6 >                 ^
 1 >
-  >        var 
-2 >            i
-3 >              = 
-4 >                0
-5 >                 ;
-1 >Emitted(6, 13) Source(6, 13) + SourceIndex(0) name (DebugClass.debugFunc)
-2 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) name (DebugClass.debugFunc)
-3 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) name (DebugClass.debugFunc)
-4 >Emitted(6, 18) Source(6, 18) + SourceIndex(0) name (DebugClass.debugFunc)
-5 >Emitted(6, 19) Source(6, 19) + SourceIndex(0) name (DebugClass.debugFunc)
+  >        
+2 >        var 
+3 >            i
+4 >              = 
+5 >                0
+6 >                 ;
+1 >Emitted(6, 9) Source(6, 9) + SourceIndex(0) name (DebugClass.debugFunc)
+2 >Emitted(6, 13) Source(6, 13) + SourceIndex(0) name (DebugClass.debugFunc)
+3 >Emitted(6, 14) Source(6, 14) + SourceIndex(0) name (DebugClass.debugFunc)
+4 >Emitted(6, 17) Source(6, 17) + SourceIndex(0) name (DebugClass.debugFunc)
+5 >Emitted(6, 18) Source(6, 18) + SourceIndex(0) name (DebugClass.debugFunc)
+6 >Emitted(6, 19) Source(6, 19) + SourceIndex(0) name (DebugClass.debugFunc)
 ---
 >>>        i++;
 1 >^^^^^^^^
@@ -250,18 +249,12 @@ sourceFile:sourceMapValidationWithComments.ts
 ---
 >>>        // End Debugger Test Code
 1->^^^^^^^^
-2 >        
-3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-  >        // End Debugger Test Code
-  >
-  >
   >        
-2 >        
-3 >        // End Debugger Test Code
-1->Emitted(16, 9) Source(19, 9) + SourceIndex(0) name (DebugClass.debugFunc)
-2 >Emitted(16, 9) Source(16, 9) + SourceIndex(0) name (DebugClass.debugFunc)
-3 >Emitted(16, 34) Source(16, 34) + SourceIndex(0) name (DebugClass.debugFunc)
+2 >        // End Debugger Test Code
+1->Emitted(16, 9) Source(16, 9) + SourceIndex(0) name (DebugClass.debugFunc)
+2 >Emitted(16, 34) Source(16, 34) + SourceIndex(0) name (DebugClass.debugFunc)
 ---
 >>>        return true;
 1 >^^^^^^^^
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js
new file mode 100644
index 0000000000000..6c831494c3d1c
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js
@@ -0,0 +1,17 @@
+//// [sourceMapVariableWithCommentsInsideModule.ts]
+module Q {
+    function P() {
+        // Test this
+        var a = 1;
+    }
+}
+
+//// [sourceMapVariableWithCommentsInsideModule.js]
+var Q;
+(function (Q) {
+    function P() {
+        // Test this
+        var a = 1;
+    }
+})(Q || (Q = {}));
+//# sourceMappingURL=sourceMapVariableWithCommentsInsideModule.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js.map b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js.map
new file mode 100644
index 0000000000000..95a3238daaefd
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapVariableWithCommentsInsideModule.js.map]
+{"version":3,"file":"sourceMapVariableWithCommentsInsideModule.js","sourceRoot":"","sources":["sourceMapVariableWithCommentsInsideModule.ts"],"names":["Q","Q.P"],"mappings":"AAAA,IAAO,CAAC,CAKP;AALD,WAAO,CAAC,EAAC,CAAC;IACNA,SAASA,CAACA;QACNC,YAAYA;QACZA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACdA,CAACA;AACLD,CAACA,EALM,CAAC,KAAD,CAAC,QAKP"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.sourcemap.txt b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.sourcemap.txt
new file mode 100644
index 0000000000000..99531af74c67d
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.sourcemap.txt
@@ -0,0 +1,132 @@
+===================================================================
+JsFile: sourceMapVariableWithCommentsInsideModule.js
+mapUrl: sourceMapVariableWithCommentsInsideModule.js.map
+sourceRoot: 
+sources: sourceMapVariableWithCommentsInsideModule.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapVariableWithCommentsInsideModule.js
+sourceFile:sourceMapVariableWithCommentsInsideModule.ts
+-------------------------------------------------------------------
+>>>var Q;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^
+5 >      ^^^^^^^^^^->
+1 >
+2 >module 
+3 >    Q
+4 >      {
+  >         function P() {
+  >             // Test this
+  >             var a = 1;
+  >         }
+  >     }
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0)
+4 >Emitted(1, 7) Source(6, 2) + SourceIndex(0)
+---
+>>>(function (Q) {
+1->
+2 >^^^^^^^^^^^
+3 >           ^
+4 >            ^^
+5 >              ^
+6 >               ^^^^->
+1->
+2 >module 
+3 >           Q
+4 >             
+5 >              {
+1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
+3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0)
+4 >Emitted(2, 15) Source(1, 10) + SourceIndex(0)
+5 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
+---
+>>>    function P() {
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^
+4 >              ^^^^^^^->
+1->
+  >    
+2 >    function 
+3 >             P
+1->Emitted(3, 5) Source(2, 5) + SourceIndex(0) name (Q)
+2 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) name (Q)
+3 >Emitted(3, 15) Source(2, 15) + SourceIndex(0) name (Q)
+---
+>>>        // Test this
+1->^^^^^^^^
+2 >        ^^^^^^^^^^^^
+1->() {
+  >        
+2 >        // Test this
+1->Emitted(4, 9) Source(3, 9) + SourceIndex(0) name (Q.P)
+2 >Emitted(4, 21) Source(3, 21) + SourceIndex(0) name (Q.P)
+---
+>>>        var a = 1;
+1 >^^^^^^^^
+2 >        ^^^^
+3 >            ^
+4 >             ^^^
+5 >                ^
+6 >                 ^
+1 >
+  >        
+2 >        var 
+3 >            a
+4 >              = 
+5 >                1
+6 >                 ;
+1 >Emitted(5, 9) Source(4, 9) + SourceIndex(0) name (Q.P)
+2 >Emitted(5, 13) Source(4, 13) + SourceIndex(0) name (Q.P)
+3 >Emitted(5, 14) Source(4, 14) + SourceIndex(0) name (Q.P)
+4 >Emitted(5, 17) Source(4, 17) + SourceIndex(0) name (Q.P)
+5 >Emitted(5, 18) Source(4, 18) + SourceIndex(0) name (Q.P)
+6 >Emitted(5, 19) Source(4, 19) + SourceIndex(0) name (Q.P)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(6, 5) Source(5, 5) + SourceIndex(0) name (Q.P)
+2 >Emitted(6, 6) Source(5, 6) + SourceIndex(0) name (Q.P)
+---
+>>>})(Q || (Q = {}));
+1->
+2 >^
+3 > ^^
+4 >   ^
+5 >    ^^^^^
+6 >         ^
+7 >          ^^^^^^^^
+8 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >
+2 >}
+3 > 
+4 >   Q
+5 >    
+6 >         Q
+7 >           {
+  >              function P() {
+  >                  // Test this
+  >                  var a = 1;
+  >              }
+  >          }
+1->Emitted(7, 1) Source(6, 1) + SourceIndex(0) name (Q)
+2 >Emitted(7, 2) Source(6, 2) + SourceIndex(0) name (Q)
+3 >Emitted(7, 4) Source(1, 8) + SourceIndex(0)
+4 >Emitted(7, 5) Source(1, 9) + SourceIndex(0)
+5 >Emitted(7, 10) Source(1, 8) + SourceIndex(0)
+6 >Emitted(7, 11) Source(1, 9) + SourceIndex(0)
+7 >Emitted(7, 19) Source(6, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMapVariableWithCommentsInsideModule.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.types b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.types
new file mode 100644
index 0000000000000..d749ac328c6c4
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsInsideModule.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/sourceMapVariableWithCommentsInsideModule.ts ===
+module Q {
+>Q : typeof Q
+
+    function P() {
+>P : () => void
+
+        // Test this
+        var a = 1;
+>a : number
+    }
+}
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js
new file mode 100644
index 0000000000000..a69984f66b801
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js
@@ -0,0 +1,12 @@
+//// [sourceMapVariableWithCommentsNotInModule.ts]
+function P() {
+    // Test this
+    var a = 1;
+}
+
+//// [sourceMapVariableWithCommentsNotInModule.js]
+function P() {
+    // Test this
+    var a = 1;
+}
+//# sourceMappingURL=sourceMapVariableWithCommentsNotInModule.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js.map b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js.map
new file mode 100644
index 0000000000000..be5b42603ca51
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapVariableWithCommentsNotInModule.js.map]
+{"version":3,"file":"sourceMapVariableWithCommentsNotInModule.js","sourceRoot":"","sources":["sourceMapVariableWithCommentsNotInModule.ts"],"names":["P"],"mappings":"AAAA,SAAS,CAAC;IACNA,YAAYA;IACZA,IAAIA,CAACA,GAAGA,CAACA,CAACA;AACdA,CAACA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.sourcemap.txt b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.sourcemap.txt
new file mode 100644
index 0000000000000..2924a0bcf2372
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.sourcemap.txt
@@ -0,0 +1,63 @@
+===================================================================
+JsFile: sourceMapVariableWithCommentsNotInModule.js
+mapUrl: sourceMapVariableWithCommentsNotInModule.js.map
+sourceRoot: 
+sources: sourceMapVariableWithCommentsNotInModule.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapVariableWithCommentsNotInModule.js
+sourceFile:sourceMapVariableWithCommentsNotInModule.ts
+-------------------------------------------------------------------
+>>>function P() {
+1 >
+2 >^^^^^^^^^
+3 >         ^
+4 >          ^^^^^^^->
+1 >
+2 >function 
+3 >         P
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 10) Source(1, 10) + SourceIndex(0)
+3 >Emitted(1, 11) Source(1, 11) + SourceIndex(0)
+---
+>>>    // Test this
+1->^^^^
+2 >    ^^^^^^^^^^^^
+1->() {
+  >    
+2 >    // Test this
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (P)
+2 >Emitted(2, 17) Source(2, 17) + SourceIndex(0) name (P)
+---
+>>>    var a = 1;
+1 >^^^^
+2 >    ^^^^
+3 >        ^
+4 >         ^^^
+5 >            ^
+6 >             ^
+1 >
+  >    
+2 >    var 
+3 >        a
+4 >          = 
+5 >            1
+6 >             ;
+1 >Emitted(3, 5) Source(3, 5) + SourceIndex(0) name (P)
+2 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (P)
+3 >Emitted(3, 10) Source(3, 10) + SourceIndex(0) name (P)
+4 >Emitted(3, 13) Source(3, 13) + SourceIndex(0) name (P)
+5 >Emitted(3, 14) Source(3, 14) + SourceIndex(0) name (P)
+6 >Emitted(3, 15) Source(3, 15) + SourceIndex(0) name (P)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >
+2 >}
+1 >Emitted(4, 1) Source(4, 1) + SourceIndex(0) name (P)
+2 >Emitted(4, 2) Source(4, 2) + SourceIndex(0) name (P)
+---
+>>>//# sourceMappingURL=sourceMapVariableWithCommentsNotInModule.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.types b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.types
new file mode 100644
index 0000000000000..9c32284d23b04
--- /dev/null
+++ b/tests/baselines/reference/sourceMapVariableWithCommentsNotInModule.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/sourceMapVariableWithCommentsNotInModule.ts ===
+function P() {
+>P : () => void
+
+    // Test this
+    var a = 1;
+>a : number
+}
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map
index 384caae23ea89..120ce29c42b11 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js.map
@@ -1,2 +1,2 @@
 //// [fooResult.js.map]
-{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;IAClI,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
+{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["../testFiles/app.ts","../testFiles/app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
index b67d4e3be5724..601dfc05ee9f5 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
@@ -10,17 +10,12 @@ sourceFile:../testFiles/app.ts
 -------------------------------------------------------------------
 >>>// Note in the out result we are using same folder name only different in casing
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >// Note in the out result we are using same folder name only different in casing
-  >// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
-  >
-2 >
-3 >// Note in the out result we are using same folder name only different in casing
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >// Note in the out result we are using same folder name only different in casing
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
 ---
 >>>// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
 1->
@@ -32,14 +27,17 @@ sourceFile:../testFiles/app.ts
 2 >Emitted(2, 137) Source(2, 137) + SourceIndex(0)
 ---
 >>>var c = (function () {
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    c
-1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
-2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
+  >
+2 >class 
+3 >    c
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
+3 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
 ---
 >>>    function c() {
 1->^^^^
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map
index e665c70c15b3c..a1b757883fb59 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js.map
@@ -1,3 +1,3 @@
 //// [app.js.map]
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,wIAAwI;IAClI,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map]
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../testFiles/app.ts"],"names":["c","c.constructor"],"mappings":"AAAA,gFAAgF;AAChF,wIAAwI;AACxI,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map]
 {"version":3,"file":"app2.js","sourceRoot":"","sources":["../testFiles/app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
index 7d94304c3599d..46212cd326a0f 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
@@ -10,17 +10,12 @@ sourceFile:../testFiles/app.ts
 -------------------------------------------------------------------
 >>>// Note in the out result we are using same folder name only different in casing
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >// Note in the out result we are using same folder name only different in casing
-  >// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
-  >
-2 >
-3 >// Note in the out result we are using same folder name only different in casing
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >// Note in the out result we are using same folder name only different in casing
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
 ---
 >>>// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
 1->
@@ -32,14 +27,17 @@ sourceFile:../testFiles/app.ts
 2 >Emitted(2, 137) Source(2, 137) + SourceIndex(0)
 ---
 >>>var c = (function () {
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    c
-1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
-2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
+  >
+2 >class 
+3 >    c
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
+3 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
 ---
 >>>    function c() {
 1->^^^^
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
index 59e28d92f9096..5d866e941db81 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
@@ -1,2 +1,2 @@
 //// [a.js.map]
-{"version":3,"file":"a.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA;;6EAE6E;AAE7E,IAAI,CAAC,GAAG;IACJ,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACR,CAAC;ACPF;;6EAE6E;AAG7E,AADA,2BAA2B;IACvB,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"a.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA;;6EAE6E;AAE7E,IAAI,CAAC,GAAG;IACJ,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACR,CAAC;ACPF;;6EAE6E;AAE7E,2BAA2B;AAC3B,IAAI,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
index 5a87f6c04e8fb..f3f3dffd9dce1 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
@@ -100,35 +100,34 @@ sourceFile:tests/cases/compiler/b.ts
 ---
 >>>///<reference path="a.ts"/>
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
   >
-  >///<reference path="a.ts"/>
   >
-2 >
-3 >///<reference path="a.ts"/>
-1 >Emitted(11, 1) Source(6, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(5, 1) + SourceIndex(1)
-3 >Emitted(11, 28) Source(5, 28) + SourceIndex(1)
+2 >///<reference path="a.ts"/>
+1 >Emitted(11, 1) Source(5, 1) + SourceIndex(1)
+2 >Emitted(11, 28) Source(5, 28) + SourceIndex(1)
 ---
 >>>var y = x;
-1 >^^^^
-2 >    ^
-3 >     ^^^
-4 >        ^
-5 >         ^
-6 >          ^^^^^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^
+6 >         ^
+7 >          ^^^^^^^^^^^^^^^^^^->
 1 >
-  >var 
-2 >    y
-3 >      = 
-4 >        x
-5 >         ;
-1 >Emitted(12, 5) Source(6, 5) + SourceIndex(1)
-2 >Emitted(12, 6) Source(6, 6) + SourceIndex(1)
-3 >Emitted(12, 9) Source(6, 9) + SourceIndex(1)
-4 >Emitted(12, 10) Source(6, 10) + SourceIndex(1)
-5 >Emitted(12, 11) Source(6, 11) + SourceIndex(1)
+  >
+2 >var 
+3 >    y
+4 >      = 
+5 >        x
+6 >         ;
+1 >Emitted(12, 1) Source(6, 1) + SourceIndex(1)
+2 >Emitted(12, 5) Source(6, 5) + SourceIndex(1)
+3 >Emitted(12, 6) Source(6, 6) + SourceIndex(1)
+4 >Emitted(12, 9) Source(6, 9) + SourceIndex(1)
+5 >Emitted(12, 10) Source(6, 10) + SourceIndex(1)
+6 >Emitted(12, 11) Source(6, 11) + SourceIndex(1)
 ---
 >>>//# sourceMappingURL=a.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
index 0a164a2a2c251..6f6c449d5a298 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
@@ -1,2 +1,2 @@
 //// [fooResult.js.map]
-{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;IACpG,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
+{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":["c","c.constructor","d","d.constructor"],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC;ACHD,IAAM,CAAC;IAAPE,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
index 1923426adc64d..54953e032cf4d 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
@@ -10,17 +10,12 @@ sourceFile:app.ts
 -------------------------------------------------------------------
 >>>// Note in the out result we are using same folder name only different in casing
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >// Note in the out result we are using same folder name only different in casing
-  >// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
-  >
-2 >
-3 >// Note in the out result we are using same folder name only different in casing
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >// Note in the out result we are using same folder name only different in casing
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
 ---
 >>>// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
 1->
@@ -32,14 +27,17 @@ sourceFile:app.ts
 2 >Emitted(2, 107) Source(2, 107) + SourceIndex(0)
 ---
 >>>var c = (function () {
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    c
-1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
-2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
+  >
+2 >class 
+3 >    c
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
+3 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
 ---
 >>>    function c() {
 1->^^^^
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map
index 027c795967c87..0b32f7e72c997 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js.map
@@ -1,3 +1,3 @@
 //// [app.js.map]
-{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":["c","c.constructor"],"mappings":"AAEA,AAFA,gFAAgF;AAChF,0GAA0G;IACpG,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map]
+{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":["c","c.constructor"],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}//// [app2.js.map]
 {"version":3,"file":"app2.js","sourceRoot":"","sources":["app2.ts"],"names":["d","d.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IACPC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
index cfcd91a65524e..31293ae2f68f5 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
@@ -10,17 +10,12 @@ sourceFile:app.ts
 -------------------------------------------------------------------
 >>>// Note in the out result we are using same folder name only different in casing
 1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >// Note in the out result we are using same folder name only different in casing
-  >// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
-  >
-2 >
-3 >// Note in the out result we are using same folder name only different in casing
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+3 >                                                                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >// Note in the out result we are using same folder name only different in casing
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 81) Source(1, 81) + SourceIndex(0)
 ---
 >>>// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
 1->
@@ -32,14 +27,17 @@ sourceFile:app.ts
 2 >Emitted(2, 107) Source(2, 107) + SourceIndex(0)
 ---
 >>>var c = (function () {
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^->
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
 1 >
-  >class 
-2 >    c
-1 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
-2 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
+  >
+2 >class 
+3 >    c
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(3, 7) + SourceIndex(0)
+3 >Emitted(3, 6) Source(3, 8) + SourceIndex(0)
 ---
 >>>    function c() {
 1->^^^^
diff --git a/tests/baselines/reference/typeResolution.js.map b/tests/baselines/reference/typeResolution.js.map
index a39fb49d634da..15a54dfe32c53 100644
--- a/tests/baselines/reference/typeResolution.js.map
+++ b/tests/baselines/reference/typeResolution.js.map
@@ -1,2 +1,2 @@
 //// [typeResolution.js.map]
-{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,IAAaA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAmBnBC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBAEIE,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,GAANA,MAmBZA,CAAAA;gBACDA,IAAaA,MAAMA;oBAAnBI,SAAaA,MAAMA;oBAsBnBC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAG/CA,AADAA,uCAAuCA;4BACnCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,yCAAyCA;4BACrCA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,qCAAqCA;4BACjCA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAGzDA,AADAA,sBAAsBA;4BAClBA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,GAANA,MAsBZA,CAAAA;gBAEDA,IAAMA,iBAAiBA;oBACnBO,SADEA,iBAAiBA;wBAEfC,SAASA,EAAEA;4BAEPC,AADAA,uCAAuCA;gCACnCA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAGDA,AADAA,0EAA0EA;gBACpEA,MAAMA;gBACRW,SADEA,MAAMA;oBAEJC,SAASA,EAAEA;wBACPC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAGzEA,AADAA,sBAAsBA;4BAClBA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBAEzBC,AADAA,6DAA6DA;oBAChDA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBG,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CH,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBK,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CL,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA,IAAMA,MAAMA;YAAZuB,SAAMA,MAAMA;YAEZC,CAACA;YADUD,uBAAMA,GAAbA,eAAmBA;YACvBA,aAACA;QAADA,CAACA,AAFDvB,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtByB,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAAGC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,GAANA,MAAUA,CAAAA;QAC3BA,CAACA,EAFMzB,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB4B,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAEnBC,CAACA;gBADUD,yBAAQA,GAAfA,eAAqBA;gBACzBA,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,GAANA,MAEZA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
+{"version":3,"file":"typeResolution.js","sourceRoot":"","sources":["typeResolution.ts"],"names":["TopLevelModule1","TopLevelModule1.SubModule1","TopLevelModule1.SubModule1.SubSubModule1","TopLevelModule1.SubModule1.SubSubModule1.ClassA","TopLevelModule1.SubModule1.SubSubModule1.ClassA.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.ClassB","TopLevelModule1.SubModule1.SubSubModule1.ClassB.constructor","TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor","TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ","TopLevelModule1.SubModule1.ClassA","TopLevelModule1.SubModule1.ClassA.constructor","TopLevelModule1.SubModule1.ClassA.constructor.AA","TopLevelModule1.SubModule2","TopLevelModule1.SubModule2.SubSubModule2","TopLevelModule1.SubModule2.SubSubModule2.ClassA","TopLevelModule1.SubModule2.SubSubModule2.ClassA.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassB","TopLevelModule1.SubModule2.SubSubModule2.ClassB.constructor","TopLevelModule1.SubModule2.SubSubModule2.ClassC","TopLevelModule1.SubModule2.SubSubModule2.ClassC.constructor","TopLevelModule1.ClassA","TopLevelModule1.ClassA.constructor","TopLevelModule1.NotExportedModule","TopLevelModule1.NotExportedModule.ClassA","TopLevelModule1.NotExportedModule.ClassA.constructor","TopLevelModule2","TopLevelModule2.SubModule3","TopLevelModule2.SubModule3.ClassA","TopLevelModule2.SubModule3.ClassA.constructor"],"mappings":";IAAA,IAAc,eAAe,CAmG5B;IAnGD,WAAc,eAAe,EAAC,CAAC;QAC3BA,IAAcA,UAAUA,CAwEvBA;QAxEDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAcA,aAAaA,CAwD1BA;YAxDDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,IAAaA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAmBnBC,CAACA;oBAlBUD,2BAAUA,GAAjBA;wBACIE,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAnBDD,IAmBCA;gBAnBYA,oBAAMA,GAANA,MAmBZA,CAAAA;gBACDA,IAAaA,MAAMA;oBAAnBI,SAAaA,MAAMA;oBAsBnBC,CAACA;oBArBUD,2BAAUA,GAAjBA;wBACIE,+CAA+CA;wBAE/CA,uCAAuCA;wBACvCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,yCAAyCA;wBACzCA,IAAIA,EAAUA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAChCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,qCAAqCA;wBACrCA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzEA,IAAIA,EAAqCA,CAACA;wBAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAEzDA,sBAAsBA;wBACtBA,IAAIA,EAAcA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACpCA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;oBACLF,aAACA;gBAADA,CAACA,AAtBDJ,IAsBCA;gBAtBYA,oBAAMA,GAANA,MAsBZA,CAAAA;gBAEDA,IAAMA,iBAAiBA;oBACnBO,SADEA,iBAAiBA;wBAEfC,SAASA,EAAEA;4BACPC,uCAAuCA;4BACvCA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAmDA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACzEA,IAAIA,EAAcA,CAACA;4BAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;4BACpCA,IAAIA,EAAqCA,CAACA;4BAACA,EAAEA,CAACA,QAAQA,EAAEA,CAACA;wBAC7DA,CAACA;oBACLD,CAACA;oBACLD,wBAACA;gBAADA,CAACA,AAVDP,IAUCA;YACLA,CAACA,EAxDaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAwD1BA;YAEDA,0EAA0EA;YAC1EA,IAAMA,MAAMA;gBACRW,SADEA,MAAMA;oBAEJC,SAASA,EAAEA;wBACPC,IAAIA,EAAwBA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAC9CA,IAAIA,EAAmCA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBACzDA,IAAIA,EAAmDA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;wBAEzEA,sBAAsBA;wBACtBA,IAAIA,EAA4BA,CAACA;wBAACA,EAAEA,CAACA,UAAUA,EAAEA,CAACA;oBACtDA,CAACA;gBACLD,CAACA;gBACLD,aAACA;YAADA,CAACA,AAXDX,IAWCA;QACLA,CAACA,EAxEaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAwEvBA;QAEDA,IAAcA,UAAUA,CAWvBA;QAXDA,WAAcA,UAAUA,EAACA,CAACA;YACtBe,IAAcA,aAAaA,CAO1BA;YAPDA,WAAcA,aAAaA,EAACA,CAACA;gBACzBC,6DAA6DA;gBAC7DA,IAAaA,MAAMA;oBAAnBC,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CD,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBG,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CH,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAC/CA,IAAaA,MAAMA;oBAAnBK,SAAaA,MAAMA;oBAA2BC,CAACA;oBAAlBD,2BAAUA,GAAjBA,eAAuBA;oBAACA,aAACA;gBAADA,CAACA,AAA/CL,IAA+CA;gBAAlCA,oBAAMA,GAANA,MAAkCA,CAAAA;gBAEZA,JACvCA,CAACA,EAPaD,aAAaA,GAAbA,wBAAaA,KAAbA,wBAAaA,QAO1BA;YAE0CA,JAC/CA,CAACA,EAXaf,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAWvBA;QAEDA,IAAMA,MAAMA;YAAZuB,SAAMA,MAAMA;YAEZC,CAACA;YADUD,uBAAMA,GAAbA,eAAmBA;YACvBA,aAACA;QAADA,CAACA,AAFDvB,IAECA;QAMDA,IAAOA,iBAAiBA,CAEvBA;QAFDA,WAAOA,iBAAiBA,EAACA,CAACA;YACtByB,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAAGC,CAACA;gBAADD,aAACA;YAADA,CAACA,AAAvBD,IAAuBA;YAAVA,wBAAMA,GAANA,MAAUA,CAAAA;QAC3BA,CAACA,EAFMzB,iBAAiBA,KAAjBA,iBAAiBA,QAEvBA;IACLA,CAACA,EAnGa,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAmG5B;IAED,IAAO,eAAe,CAMrB;IAND,WAAO,eAAe,EAAC,CAAC;QACpB4B,IAAcA,UAAUA,CAIvBA;QAJDA,WAAcA,UAAUA,EAACA,CAACA;YACtBC,IAAaA,MAAMA;gBAAnBC,SAAaA,MAAMA;gBAEnBC,CAACA;gBADUD,yBAAQA,GAAfA,eAAqBA;gBACzBA,aAACA;YAADA,CAACA,AAFDD,IAECA;YAFYA,iBAAMA,GAANA,MAEZA,CAAAA;QACLA,CAACA,EAJaD,UAAUA,GAAVA,0BAAUA,KAAVA,0BAAUA,QAIvBA;IACLA,CAACA,EANM,eAAe,KAAf,eAAe,QAMrB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 08cb4a873d044..069a575b8fa44 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -401,29 +401,28 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Try all qualified names of this type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->public AisIn1_1_1() {
-  >                    // Try all qualified names of this type
   >                    
-2 >                        
-3 >                        // Try all qualified names of this type
-1->Emitted(12, 25) Source(7, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(12, 25) Source(6, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(12, 64) Source(6, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >                        // Try all qualified names of this type
+1->Emitted(12, 25) Source(6, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(12, 64) Source(6, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        var a1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            a1: ClassA
-3 >                              ;
-1 >Emitted(13, 29) Source(7, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(13, 31) Source(7, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(13, 32) Source(7, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            a1: ClassA
+4 >                              ;
+1 >Emitted(13, 25) Source(7, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(13, 29) Source(7, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+3 >Emitted(13, 31) Source(7, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+4 >Emitted(13, 32) Source(7, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -556,30 +555,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Two variants of qualifying a peer type
   >                    
-2 >                        
-3 >                        // Two variants of qualifying a peer type
-1->Emitted(21, 25) Source(13, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(21, 25) Source(12, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(21, 66) Source(12, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >                        // Two variants of qualifying a peer type
+1->Emitted(21, 25) Source(12, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(21, 66) Source(12, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        var b1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            b1: ClassB
-3 >                              ;
-1 >Emitted(22, 29) Source(13, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(22, 31) Source(13, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(22, 32) Source(13, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            b1: ClassB
+4 >                              ;
+1 >Emitted(22, 25) Source(13, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(22, 29) Source(13, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+3 >Emitted(22, 31) Source(13, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+4 >Emitted(22, 32) Source(13, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -640,30 +638,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Type only accessible from the root
   >                    
-2 >                        
-3 >                        // Type only accessible from the root
-1->Emitted(26, 25) Source(17, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(26, 25) Source(16, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(26, 62) Source(16, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >                        // Type only accessible from the root
+1->Emitted(26, 25) Source(16, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(26, 62) Source(16, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        var c1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
-3 >                              ;
-1 >Emitted(27, 29) Source(17, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(27, 31) Source(17, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(27, 32) Source(17, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
+4 >                              ;
+1 >Emitted(27, 25) Source(17, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(27, 29) Source(17, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+3 >Emitted(27, 31) Source(17, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+4 >Emitted(27, 32) Source(17, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -688,30 +685,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Interface reference
   >                    
-2 >                        
-3 >                        // Interface reference
-1->Emitted(29, 25) Source(20, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(29, 25) Source(19, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(29, 47) Source(19, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >                        // Interface reference
+1->Emitted(29, 25) Source(19, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(29, 47) Source(19, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        var d1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            d1: InterfaceX
-3 >                              ;
-1 >Emitted(30, 29) Source(20, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-2 >Emitted(30, 31) Source(20, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
-3 >Emitted(30, 32) Source(20, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            d1: InterfaceX
+4 >                              ;
+1 >Emitted(30, 25) Source(20, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+2 >Emitted(30, 29) Source(20, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+3 >Emitted(30, 31) Source(20, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
+4 >Emitted(30, 32) Source(20, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassA.AisIn1_1_1)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -936,30 +932,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Try all qualified names of this type
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
   >                    
-  >                    // Try all qualified names of this type
   >                    
-2 >                        
-3 >                        // Try all qualified names of this type
-1 >Emitted(43, 25) Source(29, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(43, 25) Source(28, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(43, 64) Source(28, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >                        // Try all qualified names of this type
+1 >Emitted(43, 25) Source(28, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(43, 64) Source(28, 60) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        var a1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            a1: ClassA
-3 >                              ;
-1 >Emitted(44, 29) Source(29, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(44, 31) Source(29, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(44, 32) Source(29, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            a1: ClassA
+4 >                              ;
+1 >Emitted(44, 25) Source(29, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(44, 29) Source(29, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+3 >Emitted(44, 31) Source(29, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+4 >Emitted(44, 32) Source(29, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        a1.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1092,30 +1087,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Two variants of qualifying a peer type
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Two variants of qualifying a peer type
   >                    
-2 >                        
-3 >                        // Two variants of qualifying a peer type
-1->Emitted(52, 25) Source(35, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(52, 25) Source(34, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(52, 66) Source(34, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >                        // Two variants of qualifying a peer type
+1->Emitted(52, 25) Source(34, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(52, 66) Source(34, 62) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        var b1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            b1: ClassB
-3 >                              ;
-1 >Emitted(53, 29) Source(35, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(53, 31) Source(35, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(53, 32) Source(35, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            b1: ClassB
+4 >                              ;
+1 >Emitted(53, 25) Source(35, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(53, 29) Source(35, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+3 >Emitted(53, 31) Source(35, 35) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+4 >Emitted(53, 32) Source(35, 36) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        b1.BisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1176,30 +1170,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Type only accessible from the root
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Type only accessible from the root
   >                    
-2 >                        
-3 >                        // Type only accessible from the root
-1->Emitted(57, 25) Source(39, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(57, 25) Source(38, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(57, 62) Source(38, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >                        // Type only accessible from the root
+1->Emitted(57, 25) Source(38, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(57, 62) Source(38, 58) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        var c1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
-3 >                              ;
-1 >Emitted(58, 29) Source(39, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(58, 31) Source(39, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(58, 32) Source(39, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA
+4 >                              ;
+1 >Emitted(58, 25) Source(39, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(58, 29) Source(39, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+3 >Emitted(58, 31) Source(39, 76) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+4 >Emitted(58, 32) Source(39, 77) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        c1.AisIn1_2_2();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1260,30 +1253,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Interface reference
   >                    
-2 >                        
-3 >                        // Interface reference
-1->Emitted(62, 25) Source(43, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(62, 25) Source(42, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(62, 47) Source(42, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >                        // Interface reference
+1->Emitted(62, 25) Source(42, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(62, 47) Source(42, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        var d1;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            d1: InterfaceX
-3 >                              ;
-1 >Emitted(63, 29) Source(43, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-2 >Emitted(63, 31) Source(43, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
-3 >Emitted(63, 32) Source(43, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+  >                    
+2 >                        var 
+3 >                            d1: InterfaceX
+4 >                              ;
+1 >Emitted(63, 25) Source(43, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+2 >Emitted(63, 29) Source(43, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+3 >Emitted(63, 31) Source(43, 39) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
+4 >Emitted(63, 32) Source(43, 40) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.ClassB.BisIn1_1_1)
 ---
 >>>                        d1.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1479,29 +1471,28 @@ sourceFile:typeResolution.ts
 ---
 >>>                            /* Sampling of stuff from AisIn1_1_1 */
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            
-3 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->() {
-  >                        /* Sampling of stuff from AisIn1_1_1 */
   >                        
-2 >                            
-3 >                            /* Sampling of stuff from AisIn1_1_1 */
-1->Emitted(74, 29) Source(52, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
-2 >Emitted(74, 29) Source(51, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
-3 >Emitted(74, 68) Source(51, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+2 >                            /* Sampling of stuff from AisIn1_1_1 */
+1->Emitted(74, 29) Source(51, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+2 >Emitted(74, 68) Source(51, 64) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
 ---
 >>>                            var a4;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                ^^
-3 >                                  ^
-4 >                                   ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                            ^^^^
+3 >                                ^^
+4 >                                  ^
+5 >                                   ^^^^^^^^^^->
 1 >
-  >                        var 
-2 >                                a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
-3 >                                  ;
-1 >Emitted(75, 33) Source(52, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
-2 >Emitted(75, 35) Source(52, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
-3 >Emitted(75, 36) Source(52, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+  >                        
+2 >                            var 
+3 >                                a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA
+4 >                                  ;
+1 >Emitted(75, 29) Source(52, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+2 >Emitted(75, 33) Source(52, 29) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+3 >Emitted(75, 35) Source(52, 80) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
+4 >Emitted(75, 36) Source(52, 81) + SourceIndex(0) name (TopLevelModule1.SubModule1.SubSubModule1.NonExportedClassQ.constructor.QQ)
 ---
 >>>                            a4.AisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1772,27 +1763,26 @@ sourceFile:typeResolution.ts
 ---
 >>>            // Should have no effect on S1.SS1.ClassA above because it is not exported
 1 >^^^^^^^^^^^^
-2 >            
-3 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
   >        
-  >        // Should have no effect on S1.SS1.ClassA above because it is not exported
   >        
-2 >            
-3 >            // Should have no effect on S1.SS1.ClassA above because it is not exported
-1 >Emitted(88, 13) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1)
-2 >Emitted(88, 13) Source(61, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1)
-3 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1)
+2 >            // Should have no effect on S1.SS1.ClassA above because it is not exported
+1 >Emitted(88, 13) Source(61, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1)
+2 >Emitted(88, 87) Source(61, 83) + SourceIndex(0) name (TopLevelModule1.SubModule1)
 ---
 >>>            var ClassA = (function () {
-1 >^^^^^^^^^^^^^^^^
-2 >                ^^^^^^
-3 >                      ^^^^^^^^^^^^^^->
+1 >^^^^^^^^^^^^
+2 >            ^^^^
+3 >                ^^^^^^
+4 >                      ^^^^^^^^^^^^^^->
 1 >
-  >        class 
-2 >                ClassA
-1 >Emitted(89, 17) Source(62, 15) + SourceIndex(0) name (TopLevelModule1.SubModule1)
-2 >Emitted(89, 23) Source(62, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1)
+  >        
+2 >            class 
+3 >                ClassA
+1 >Emitted(89, 13) Source(62, 9) + SourceIndex(0) name (TopLevelModule1.SubModule1)
+2 >Emitted(89, 17) Source(62, 15) + SourceIndex(0) name (TopLevelModule1.SubModule1)
+3 >Emitted(89, 23) Source(62, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1)
 ---
 >>>                function ClassA() {
 1->^^^^^^^^^^^^^^^^
@@ -1932,30 +1922,29 @@ sourceFile:typeResolution.ts
 ---
 >>>                        // Interface reference
 1->^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                        
-3 >                        ^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^^^^^^^^^^^^^^^^^^^
 1->
   >                    
-  >                    // Interface reference
   >                    
-2 >                        
-3 >                        // Interface reference
-1->Emitted(98, 25) Source(70, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
-2 >Emitted(98, 25) Source(69, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
-3 >Emitted(98, 47) Source(69, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+2 >                        // Interface reference
+1->Emitted(98, 25) Source(69, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+2 >Emitted(98, 47) Source(69, 43) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
 ---
 >>>                        var d2;
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                            ^^
-3 >                              ^
-4 >                               ^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                        ^^^^
+3 >                            ^^
+4 >                              ^
+5 >                               ^^^^^^^^^^->
 1 >
-  >                    var 
-2 >                            d2: SubSubModule1.InterfaceX
-3 >                              ;
-1 >Emitted(99, 29) Source(70, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
-2 >Emitted(99, 31) Source(70, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
-3 >Emitted(99, 32) Source(70, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+  >                    
+2 >                        var 
+3 >                            d2: SubSubModule1.InterfaceX
+4 >                              ;
+1 >Emitted(99, 25) Source(70, 21) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+2 >Emitted(99, 29) Source(70, 25) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+3 >Emitted(99, 31) Source(70, 53) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
+4 >Emitted(99, 32) Source(70, 54) + SourceIndex(0) name (TopLevelModule1.SubModule1.ClassA.constructor.AA)
 ---
 >>>                        d2.XisIn1_1_1();
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2221,26 +2210,25 @@ sourceFile:typeResolution.ts
 ---
 >>>                // No code here since these are the mirror of the above calls
 1->^^^^^^^^^^^^^^^^
-2 >                
-3 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
-  >            // No code here since these are the mirror of the above calls
   >            
-2 >                
-3 >                // No code here since these are the mirror of the above calls
-1->Emitted(110, 17) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
-2 >Emitted(110, 17) Source(78, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
-3 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
+2 >                // No code here since these are the mirror of the above calls
+1->Emitted(110, 17) Source(78, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
+2 >Emitted(110, 78) Source(78, 74) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
 ---
 >>>                var ClassA = (function () {
-1 >^^^^^^^^^^^^^^^^^^^^
-2 >                    ^^^^^^
-3 >                          ^^^^^^^^^^^^^^->
+1 >^^^^^^^^^^^^^^^^
+2 >                ^^^^
+3 >                    ^^^^^^
+4 >                          ^^^^^^^^^^^^^^->
 1 >
-  >            export class 
-2 >                    ClassA
-1 >Emitted(111, 21) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
-2 >Emitted(111, 27) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
+  >            
+2 >                export class 
+3 >                    ClassA
+1 >Emitted(111, 17) Source(79, 13) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
+2 >Emitted(111, 21) Source(79, 26) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
+3 >Emitted(111, 27) Source(79, 32) + SourceIndex(0) name (TopLevelModule1.SubModule2.SubSubModule2)
 ---
 >>>                    function ClassA() {
 1->^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
index cddf9ebf25461..a8d4258b77d77 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
@@ -134,7 +134,7 @@ var Errors;
     var ConnectionError /* extends Error */ = (function () {
         function ConnectionError /* extends Error */(request) {
         }
-        return ConnectionError /* extends Error */;
+        return ConnectionError;
     })();
     Errors.ConnectionError /* extends Error */ = ConnectionError /* extends Error */;
 })(Errors || (Errors = {}));
diff --git a/tests/cases/compiler/sourceMapVariableWithCommentsInsideModule.ts b/tests/cases/compiler/sourceMapVariableWithCommentsInsideModule.ts
new file mode 100644
index 0000000000000..cf9640377d7f5
--- /dev/null
+++ b/tests/cases/compiler/sourceMapVariableWithCommentsInsideModule.ts
@@ -0,0 +1,7 @@
+// @sourcemap: true
+module Q {
+    function P() {
+        // Test this
+        var a = 1;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapVariableWithCommentsNotInModule.ts b/tests/cases/compiler/sourceMapVariableWithCommentsNotInModule.ts
new file mode 100644
index 0000000000000..b009606872170
--- /dev/null
+++ b/tests/cases/compiler/sourceMapVariableWithCommentsNotInModule.ts
@@ -0,0 +1,5 @@
+// @sourcemap: true
+function P() {
+    // Test this
+    var a = 1;
+}
\ No newline at end of file