Test with trivia and fix indentation with dedented label

Author: Andy Hanson

src/services/codefixes/fixUnusedLabel.ts

@@ -14,7 +14,12 @@ namespace ts.codefix {
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, start: number): void {
         const token = getTokenAtPosition(sourceFile, start, /*includeJsDocComment*/ false);
-        const statement = cast(token.parent, isLabeledStatement).statement;
-        changes.deleteRange(sourceFile, { pos: token.getStart(sourceFile), end: statement.getStart(sourceFile) });
+        const labeledStatement = cast(token.parent, isLabeledStatement);
+        const pos = token.getStart(sourceFile);
+        const statementPos = labeledStatement.statement.getStart(sourceFile);
+        // If label is on a separate line, just delete the rest of that line, but not the indentation of the labeled statement.
+        const end = positionsAreOnSameLine(pos, statementPos, sourceFile) ? statementPos
+            : skipTrivia(sourceFile.text, findChildOfKind(labeledStatement, SyntaxKind.ColonToken, sourceFile)!.end, /*stopAfterLineBreak*/ true);
+        changes.deleteRange(sourceFile, { pos, end });
     }
 }

tests/cases/fourslash/codeFixUnusedLabel.ts

@@ -2,10 +2,10 @@
 
 // @noUnusedLocals: true
 
-////label: while (1) {}
+/////* a */label/* b */:/* c */while (1) {}
 
 verify.codeFix({
     description: "Remove unused label",
     newFileContent:
-`while (1) {}`,
+`/* a */while (1) {}`,
 });

tests/cases/fourslash/codeFixUnusedLabel_all.ts

@@ -3,12 +3,19 @@
 // @noUnusedLocals: true
 
 ////label1: while (1) {}
-////label2: while (1) {}
+////
+////function f() {
+////label2:
+////    while (1) {}
+////}
 
 verify.codeFixAll({
     fixId: "fixUnusedLabel",
     fixAllDescription: "Remove all unused labels",
     newFileContent:
 `while (1) {}
-while (1) {}`,
+
+function f() {
+    while (1) {}
+}`,
 });