Handle trivia in code fix forgotten-this

amcasey · amcasey · commit 3020f3d2e6de · 2018-01-30T13:25:39.000-08:00
Fixes microsoft#21433
diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
@@ -21,6 +21,8 @@ namespace ts.codefix {
     }
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Identifier): void {
-        changes.replaceNode(sourceFile, token, createPropertyAccess(createThis(), token));
+        // TODO (https://github.com/Microsoft/TypeScript/issues/21246): use shared helper
+        suppressLeadingAndTrailingTrivia(token);
+        changes.replaceRange(sourceFile, { pos: token.getStart(), end: token.end }, createPropertyAccess(createThis(), token));
     }
 }
diff --git a/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts b/tests/cases/fourslash/codeFixForgottenThisPropertyAccess03.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts' />
+
+////class C {
+////    foo: number;
+////    constructor() {[|
+////        /* a comment */foo = 10;
+////    |]}
+////}
+
+verify.codeFix({
+    description: "Add 'this.' to unresolved variable",
+    newRangeContent: `
+        /* a comment */this.foo = 10;
+    `
+});

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ namespace ts.codefix {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, token: Identifier): void {`
`24`		`- changes.replaceNode(sourceFile, token, createPropertyAccess(createThis(), token));`
	`24`	`+ // TODO (https://github.com/Microsoft/TypeScript/issues/21246): use shared helper`
	`25`	`+ suppressLeadingAndTrailingTrivia(token);`
	`26`	`+ changes.replaceRange(sourceFile, { pos: token.getStart(), end: token.end }, createPropertyAccess(createThis(), token));`
`25`	`27`	`}`
`26`	`28`	`}`