-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add code fix to remove unused label #24037
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
/* @internal */ | ||
namespace ts.codefix { | ||
const fixId = "fixUnusedLabel"; | ||
const errorCodes = [Diagnostics.Unused_label.code]; | ||
registerCodeFix({ | ||
errorCodes, | ||
getCodeActions(context) { | ||
const changes = textChanges.ChangeTracker.with(context, t => doChange(t, context.sourceFile, context.span.start)); | ||
return [createCodeFixAction(fixId, changes, Diagnostics.Remove_unused_label, fixId, Diagnostics.Remove_all_unused_labels)]; | ||
}, | ||
fixIds: [fixId], | ||
getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => doChange(changes, diag.file, diag.start)), | ||
}); | ||
|
||
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) }); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
/// <reference path='fourslash.ts' /> | ||
|
||
// @noUnusedLocals: true | ||
|
||
////label: while (1) {} | ||
|
||
verify.codeFix({ | ||
description: "Remove unused label", | ||
newFileContent: | ||
`while (1) {}`, | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
/// <reference path='fourslash.ts' /> | ||
|
||
// @noUnusedLocals: true | ||
|
||
////label1: while (1) {} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What happens for outdented labels on preceding lines?
Does formatting restore the indentation? Otherwise, it seems like you'd end up with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed. |
||
////label2: while (1) {} | ||
|
||
verify.codeFixAll({ | ||
fixId: "fixUnusedLabel", | ||
fixAllDescription: "Remove all unused labels", | ||
newFileContent: | ||
`while (1) {} | ||
while (1) {}`, | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this will remove comments on the statement before the label.. if you are deleting a range, why not just delete from token.pos to
:
.end?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted to remove the space between the
:
and the statement following it.token.getStart
should not include any comments precedingtoken
. (Buttoken.pos
would.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/*not deleted*/ label /*deleted*/ : /*deleted*/ call();
?