Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/util/codeActions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as vscode from 'vscode';
import { DiagnosticMetadataStore } from './diagnostics';
import { DiagnosticMetadataStore, filterDiagnosticsDuplicatesForLine } from './diagnostics';
import { ProjectFileStore } from './files';
export class CodeActionProvider implements vscode.CodeActionProvider {
constructor(
Expand All @@ -15,7 +15,10 @@ export class CodeActionProvider implements vscode.CodeActionProvider {

const actions: vscode.CodeAction[] = [];

for (const diagnostic of context.diagnostics) {
// If same warning exists more than once on a given line we don't want duplicated code actions
const diagnostics = filterDiagnosticsDuplicatesForLine(context.diagnostics);

for (const diagnostic of diagnostics) {
// Only provide these code actions for cppcheck errors
if (diagnostic.source !== 'cppcheck') {
continue;
Expand Down
20 changes: 20 additions & 0 deletions src/util/diagnostics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@ export class DiagnosticMetadataStore {
}
}

export function filterDiagnosticsDuplicatesForLine(diagnostics: readonly vscode.Diagnostic[]) {
// If we have more than 1 diagnostic of a given type for the same line we want to remove all but one
const filteredDiagnostics : vscode.Diagnostic[] = [];

for (const diagnostic of diagnostics) {
const duplicate = filteredDiagnostics.some((d) => {
if (typeof(diagnostic?.code) === "object" && typeof(diagnostic?.code) !== null && typeof(d?.code) === "object" && typeof(d?.code) !== null) {
return diagnostic.code.value === d.code.value && diagnostic.range.start.line === d.range.start.line;
} else {
return diagnostic.code === d.code && diagnostic.range.start.line === d.range.start.line;
}
});
if (!duplicate) {
filteredDiagnostics.push(diagnostic);
}
}

return filteredDiagnostics;
}

export function diagnosticsUnion(diagnosticsA : vscode.Diagnostic[], diagnosticB : vscode.Diagnostic[]) : vscode.Diagnostic[] {
const diagnosticsUnion = new Array<vscode.Diagnostic>;
// Add all elements from diagnosticsA to result array
Expand Down
Loading