Skip to content

Commit 560df86

Browse files
authored
Handle unused directive problems (#1588)
* Add directive fix type * Handle unused directive problems * Avoid double sets * Add explanation * Simplify metadata * Replace ifs by map entry
1 parent 0dee5b2 commit 560df86

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

server/src/eslint.ts

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,19 @@ export type RuleMetaData = {
123123
};
124124

125125
export namespace RuleMetaData {
126+
// For unused eslint-disable comments, ESLint does not include a rule ID
127+
// nor any other metadata (although they do provide a fix). In order to
128+
// provide code actions for these, we create a fake rule ID and metadata.
129+
export const unusedDisableDirectiveId = 'unused-disable-directive';
130+
const unusedDisableDirectiveMeta: RuleMetaData = {
131+
docs: {
132+
url: 'https://eslint.org/docs/latest/use/configure/rules#report-unused-eslint-disable-comments'
133+
},
134+
type: 'directive'
135+
};
136+
126137
const handled: Set<string> = new Set();
127-
const ruleId2Meta: Map<string, RuleMetaData> = new Map();
138+
const ruleId2Meta: Map<string, RuleMetaData> = new Map([[unusedDisableDirectiveId, unusedDisableDirectiveMeta]]);
128139

129140
export function capture(eslint: ESLintClass, reports: ESLintDocumentReport[]): void {
130141
let rulesMetaData: Record<string, RuleMetaData> | undefined;
@@ -154,6 +165,7 @@ export namespace RuleMetaData {
154165
export function clear(): void {
155166
handled.clear();
156167
ruleId2Meta.clear();
168+
ruleId2Meta.set(unusedDisableDirectiveId, unusedDisableDirectiveMeta);
157169
}
158170

159171
export function getUrl(ruleId: string): string | undefined {
@@ -167,6 +179,10 @@ export namespace RuleMetaData {
167179
export function hasRuleId(ruleId: string): boolean {
168180
return ruleId2Meta.has(ruleId);
169181
}
182+
183+
export function isUnusedDisableDirectiveProblem(problem: ESLintProblem): boolean {
184+
return problem.ruleId === null && problem.message.startsWith('Unused eslint-disable directive');
185+
}
170186
}
171187

172188
export type ParserOptions = {
@@ -1081,7 +1097,7 @@ export namespace ESLint {
10811097
}
10821098
}
10831099

1084-
const validFixTypes = new Set<string>(['problem', 'suggestion', 'layout']);
1100+
const validFixTypes = new Set<string>(['problem', 'suggestion', 'layout', 'directive']);
10851101
export async function validate(document: TextDocument, settings: TextDocumentSettings & { library: ESLintModule }): Promise<Diagnostic[]> {
10861102
const newOptions: CLIOptions = Object.assign(Object.create(null), settings.options);
10871103
let fixTypes: Set<string> | undefined = undefined;
@@ -1121,6 +1137,10 @@ export namespace ESLint {
11211137
CodeActions.record(document, diagnostic, problem);
11221138
}
11231139
} else {
1140+
if (RuleMetaData.isUnusedDisableDirectiveProblem(problem)) {
1141+
problem.ruleId = RuleMetaData.unusedDisableDirectiveId;
1142+
}
1143+
11241144
CodeActions.record(document, diagnostic, problem);
11251145
}
11261146
}

server/src/eslintServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ messageQueue.registerRequest(CodeActionRequest.type, async (params) => {
845845
});
846846
}
847847

848-
if (settings.codeAction.disableRuleComment.enable) {
848+
if (settings.codeAction.disableRuleComment.enable && ruleId !== RuleMetaData.unusedDisableDirectiveId) {
849849
let workspaceChange = new WorkspaceChange();
850850
if (settings.codeAction.disableRuleComment.location === 'sameLine') {
851851
workspaceChange.getTextEditChange({ uri, version: documentVersion }).add(createDisableSameLineTextEdit(textDocument, editInfo));

0 commit comments

Comments
 (0)