Fix comment behavior in remove unused named bindings

minestarks · minestarks · commit 80b64de1e45b · 2017-07-11T14:53:08.000-07:00
diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts
@@ -128,8 +128,7 @@ namespace ts.codefix {
                     // import d|, { a }| from './file'
                     const previousToken = getTokenAtPosition(sourceFile, namedBindings.pos - 1, /*includeJsDocComment*/ false);
                     if (previousToken && previousToken.kind === SyntaxKind.CommaToken) {
-                        const startPosition = textChanges.getAdjustedStartPosition(sourceFile, previousToken, {}, textChanges.Position.FullStart);
-                        return [deleteRange({ pos: startPosition, end: namedBindings.end })];
+                        return [deleteRange({ pos: previousToken.getStart(), end: namedBindings.end })];
                     }
                     return undefined;
                 }
diff --git a/tests/cases/fourslash/unusedImports14FS.ts b/tests/cases/fourslash/unusedImports14FS.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+// @noUnusedLocals: true
+// @Filename: file2.ts
+//// [| import /* 1 */ A /* 2 */, /* 3 */ { x } from './a'; |]
+//// console.log(A);
+
+// @Filename: file1.ts
+//// export default 10;
+//// export var x = 10;
+
+verify.rangeAfterCodeFix("import /* 1 */ A /* 2 */ from './a';");

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,7 @@ namespace ts.codefix {`
`128`	`128`	`// import d\|, { a }\| from './file'`
`129`	`129`	`const previousToken = getTokenAtPosition(sourceFile, namedBindings.pos - 1, /includeJsDocComment/ false);`
`130`	`130`	`if (previousToken && previousToken.kind === SyntaxKind.CommaToken) {`
`131`		`- const startPosition = textChanges.getAdjustedStartPosition(sourceFile, previousToken, {}, textChanges.Position.FullStart);`
`132`		`- return [deleteRange({ pos: startPosition, end: namedBindings.end })];`
	`131`	`+ return [deleteRange({ pos: previousToken.getStart(), end: namedBindings.end })];`
`133`	`132`	`}`
`134`	`133`	`return undefined;`
`135`	`134`	`}`