Skip to content

fix / dont show inline suppression code action for multiple location warning #108

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.

Sign up for GitHub

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

Closed
davidramnero wants to merge 1 commit into from
Closed

fix / dont show inline suppression code action for multiple location warning #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions src/util/codeActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ export class CodeActionProvider implements vscode.CodeActionProvider {
const lineText = document.lineAt(mainLocLineNumber).text;
const expectedLineText = this.metadataStore.get(diagnostic)?.mainLocLine;

// Additional locations are stored in the relatedInformation field
const multipleLocationWarning = (diagnostic.relatedInformation?.length ?? 0 ) > 0;

// If document has been edited so that diagnostic no longer refers to the correct line we don't provide code actions
if (lineText !== expectedLineText) {
continue;
Expand All @@ -47,26 +50,28 @@ export class CodeActionProvider implements vscode.CodeActionProvider {
// Copy indentation from line affected by diagnostic
const indent = lineText.match(/^\s*/)?.[0] ?? "";

// Insert suppression comment above affected line
const suppressLineEdit = new vscode.WorkspaceEdit();
suppressLineEdit.insert(
document.uri,
new vscode.Position(
diagnostic.range.start.line,
0,
),
`${indent}// cppcheck-suppress ${diagnosticCode}\n`
);
suppressAction.edit = suppressLineEdit;
if (!multipleLocationWarning) {
// Insert suppression comment above affected line
const suppressLineEdit = new vscode.WorkspaceEdit();
suppressLineEdit.insert(
document.uri,
new vscode.Position(
diagnostic.range.start.line,
0,
),
`${indent}// cppcheck-suppress ${diagnosticCode}\n`
);
suppressAction.edit = suppressLineEdit;

// For inline suppression we also hide the warning so user does not have to rerun analysis for it to disappear
suppressAction.command = {
command: "cppcheck-official.hideWarning",
title: "Hide warning",
arguments: [document.uri, diagnosticCode, diagnostic.range]
};
suppressAction.diagnostics = [diagnostic];
actions.push(suppressAction);
// For inline suppression we also hide the warning so user does not have to rerun analysis for it to disappear
suppressAction.command = {
command: "cppcheck-official.hideWarning",
title: "Hide warning",
arguments: [document.uri, diagnosticCode, diagnostic.range]
};
suppressAction.diagnostics = [diagnostic];
actions.push(suppressAction);
}

// Set up an action for hiding a warning
const hideAction = new vscode.CodeAction(
Expand Down
Loading