fix PropertyDeclaration emit missing exclamationToken

microsoft · Feb 2, 2018 · 57b1033 · 57b1033
1 parent 71ad30e
commit 57b1033
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -1020,6 +1020,7 @@ namespace ts {
             emitModifiers(node, node.modifiers);
             emit(node.name);
             emitIfPresent(node.questionToken);
+            emitIfPresent(node.exclamationToken);
             emitTypeAnnotation(node.type);
             emitInitializer(node.initializer);
             writeSemicolon();

diff --git a/src/services/codefixes/fixAddMissingDefiniteAssignmentAssertions.ts b/src/services/codefixes/fixAddMissingDefiniteAssignmentAssertions.ts
@@ -13,6 +13,8 @@ namespace ts.codefix {
         fixIds: [fixId],
         getAllCodeActions: context => {
             const seenNames = createMap<true>();
+            const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
+
             return codeFixAll(context, errorCodes, (changes, diag) => {
                 const info = getInfo(diag.file!, diag.start!);
                 if (!info) return undefined;
@@ -22,7 +24,7 @@ namespace ts.codefix {
                     return;
                 }
 
-                addDefiniteAssignmentAssertion(changes, diag.file, propertyDeclaration);
+                addDefiniteAssignmentAssertion(changes, diag.file, propertyDeclaration, newLineCharacter);
             });
         },
     });
@@ -43,13 +45,16 @@ namespace ts.codefix {
     }
 
     function getActionsForAddMissingDefiniteAssignmentAssertion (context: CodeFixContext, token: Identifier, propertyDeclaration: PropertyDeclaration): CodeFixAction[] | undefined {
+        const newLineCharacter = getNewLineOrDefaultFromHost(context.host, context.formatContext.options);
         const description = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Declare_property_0), [token.text]);
-        const changes = textChanges.ChangeTracker.with(context, t => addDefiniteAssignmentAssertion(t, context.sourceFile, propertyDeclaration));
+        const changes = textChanges.ChangeTracker.with(context, t => addDefiniteAssignmentAssertion(t, context.sourceFile, propertyDeclaration, newLineCharacter));
         const action = { description, changes, fixId };
         return [ action ];
     }
 
-    function addDefiniteAssignmentAssertion(changeTracker: textChanges.ChangeTracker, propertyDeclarationSourceFile: SourceFile, propertyDeclaration: PropertyDeclaration): void {
-        changeTracker.insertTokenAfter(propertyDeclarationSourceFile, SyntaxKind.ExclamationToken, propertyDeclaration.name);
+    function addDefiniteAssignmentAssertion(changeTracker: textChanges.ChangeTracker, propertyDeclarationSourceFile: SourceFile, propertyDeclaration: PropertyDeclaration, newLineCharacter: string): void {
+        const property = clone(propertyDeclaration);
+        property.exclamationToken = createToken(SyntaxKind.ExclamationToken);
+        changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property, { suffix: newLineCharacter });
     }
 }
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -350,11 +350,6 @@ namespace ts.textChanges {
             this.replaceWithSingle(sourceFile, pos, pos, createToken(modifier), { suffix: " " });
         }
 
-        public insertTokenAfter(sourceFile: SourceFile, token: SyntaxKind, after: Node) {
-            const pos = after.getEnd();
-            this.replaceWithSingle(sourceFile, pos, pos, createToken(token), {});
-        }
-
         public changeIdentifierToPropertyAccess(sourceFile: SourceFile, prefix: string, node: Identifier): void {
             const startPosition = getAdjustedStartPosition(sourceFile, node, {}, Position.Start);
             this.replaceWithSingle(sourceFile, startPosition, startPosition, createPropertyAccess(createIdentifier(prefix), ""), {});