Handle unused directive problems

server/src/eslint.ts

@@ -126,16 +126,23 @@ export namespace RuleMetaData {
 	const handled: Set<string> = new Set();
 	const ruleId2Meta: Map<string, RuleMetaData> = new Map();
 
+	// For unused eslint-disable comments, ESLint does not include a rule ID
+	// nor any other metadata (although they do provide a fix). In order to
+	// provide code actions for these, we create a fake rule ID and metadata.
+	export const unusedDisableDirectiveId = 'unused-disable-directive';
+
 	export function capture(eslint: ESLintClass, reports: ESLintDocumentReport[]): void {
 		let rulesMetaData: Record<string, RuleMetaData> | undefined;
 		if (eslint.isCLIEngine) {
 			const toHandle = reports.filter(report => !handled.has(report.filePath));
 			if (toHandle.length === 0) {
 				return;
 			}
+			addUnusedDisableDirectivesMeta(toHandle);
 			rulesMetaData = typeof eslint.getRulesMetaForResults === 'function' ? eslint.getRulesMetaForResults(toHandle) : undefined;
 			toHandle.forEach(report => handled.add(report.filePath));
 		} else {
+			addUnusedDisableDirectivesMeta(reports);
 			rulesMetaData = typeof eslint.getRulesMetaForResults === 'function' ? eslint.getRulesMetaForResults(reports) : undefined;
 		}
 		if (rulesMetaData === undefined) {
@@ -167,6 +174,31 @@ export namespace RuleMetaData {
 	export function hasRuleId(ruleId: string): boolean {
 		return ruleId2Meta.has(ruleId);
 	}
+
+	export function isUnusedDisableDirectiveProblem(problem: ESLintProblem): boolean {
+		return problem.ruleId === null && problem.message.startsWith('Unused eslint-disable directive');
+	}
+
+	function addUnusedDisableDirectivesMeta(reports: ESLintDocumentReport[]): void {
+		if (hasRuleId(unusedDisableDirectiveId)) {
+			return;
+		}
+
+		for (const report of reports) {
+			for (const message of report.messages) {
+				if (isUnusedDisableDirectiveProblem(message)) {
+					ruleId2Meta.set(unusedDisableDirectiveId, {
+						docs: {
+							url: 'https://eslint.org/docs/latest/use/configure/rules#report-unused-eslint-disable-comments'
+						},
+						type: 'directive'
+					});
+
+					return;
+				}
+			}
+		}
+	}
 }
 
 export type ParserOptions = {
@@ -1071,7 +1103,7 @@ export namespace ESLint {
 		}
 	}
 
-	const validFixTypes = new Set<string>(['problem', 'suggestion', 'layout']);
+	const validFixTypes = new Set<string>(['problem', 'suggestion', 'layout', 'directive']);
 	export async function validate(document: TextDocument, settings: TextDocumentSettings & { library: ESLintModule }): Promise<Diagnostic[]> {
 		const newOptions: CLIOptions = Object.assign(Object.create(null), settings.options);
 		let fixTypes: Set<string> | undefined = undefined;
@@ -1111,6 +1143,10 @@ export namespace ESLint {
 									CodeActions.record(document, diagnostic, problem);
 								}
 							} else {
+								if (RuleMetaData.isUnusedDisableDirectiveProblem(problem)) {
+									problem.ruleId = RuleMetaData.unusedDisableDirectiveId;
+								}
+
 								CodeActions.record(document, diagnostic, problem);
 							}
 						}

server/src/eslintServer.ts

@@ -845,7 +845,7 @@ messageQueue.registerRequest(CodeActionRequest.type, async (params) => {
 			});
 		}
 
-		if (settings.codeAction.disableRuleComment.enable) {
+		if (settings.codeAction.disableRuleComment.enable && ruleId !== RuleMetaData.unusedDisableDirectiveId) {
 			let workspaceChange = new WorkspaceChange();
 			if (settings.codeAction.disableRuleComment.location === 'sameLine') {
 				workspaceChange.getTextEditChange({ uri, version: documentVersion }).add(createDisableSameLineTextEdit(textDocument, editInfo));