Refactor sourcemap emitter

Author: rbuckton

src/compiler/checker.ts

@@ -3016,7 +3016,7 @@ namespace ts {
                 const sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName);
                 const printer = createPrinter({ removeComments: true, omitTrailingSemicolon: true });
                 const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
-                printer.writeNode(EmitHint.Unspecified, sig!, /*sourceFile*/ sourceFile, writer); // TODO: GH#18217
+                printer.writeNode(EmitHint.Unspecified, sig!, /*sourceFile*/ sourceFile, getTrailingSemicolonOmittingWriter(writer)); // TODO: GH#18217
                 return writer;
             }
         }

src/compiler/comments.ts

@@ -155,13 +155,13 @@ namespace ts {
                 writer.writeLine();
             }
             else {
-                writer.write(" ");
+                writer.writeSpace(" ");
             }
         }
 
         function emitTrailingSynthesizedComment(comment: SynthesizedComment) {
             if (!writer.isAtStartOfLine()) {
-                writer.write(" ");
+                writer.writeSpace(" ");
             }
             writeSynthesizedComment(comment);
             if (comment.hasTrailingNewLine) {
@@ -283,7 +283,7 @@ namespace ts {
                 writer.writeLine();
             }
             else if (kind === SyntaxKind.MultiLineCommentTrivia) {
-                writer.write(" ");
+                writer.writeSpace(" ");
             }
         }
 
@@ -303,7 +303,7 @@ namespace ts {
             if (!shouldWriteComment(currentText, commentPos)) return;
             // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment2*/
             if (!writer.isAtStartOfLine()) {
-                writer.write(" ");
+                writer.writeSpace(" ");
             }
 
             if (emitPos) emitPos(commentPos);
@@ -342,7 +342,7 @@ namespace ts {
                 writer.writeLine();
             }
             else {
-                writer.write(" ");
+                writer.writeSpace(" ");
             }
         }