extracted codeActionProvider class to sepparate util file

Author: davidramnero

src/extension.ts

@@ -6,7 +6,8 @@ import * as crypto from 'crypto';
 import { documentationLinkMap, getPremiumCertLink } from './util/documentation';
 import { runCommand } from './util/scripts';
 import { looksLikePath, resolvePath, findWorkspaceRoot } from './util/path';
-import { CodeActionProvider, diagnosticsUnion } from './util/diagnostics';
+import { diagnosticsUnion } from './util/diagnostics';
+import { CodeActionProvider } from './util/codeActions';
 
 // To keep track of document changes we save hashed versions of their content to this record
 let documentHashMemory : Record<string, string> = {};

src/util/codeActions.ts

@@ -0,0 +1,61 @@
+import * as vscode from 'vscode';
+
+export class CodeActionProvider implements vscode.CodeActionProvider {
+    provideCodeActions(
+        document: vscode.TextDocument,
+        range: vscode.Range,
+        context: vscode.CodeActionContext,
+        token: vscode.CancellationToken
+    ): vscode.CodeAction[] {
+
+        const actions: vscode.CodeAction[] = [];
+
+        for (const diagnostic of context.diagnostics) {
+            var diagnosticCode = diagnostic.code;
+            if (typeof(diagnosticCode) === "object" && typeof(diagnosticCode) !== null) {
+                diagnosticCode = diagnosticCode.value;
+            }
+            
+            // Set up one action for suppressing the specific warning on the line targeted by the diagnostic
+            const suppressAction = new vscode.CodeAction(
+                `Suppress warning for ${diagnosticCode} here`,
+                vscode.CodeActionKind.QuickFix
+            );
+
+            // Copy indentation from line affected by diagnostic
+            const lineText = document.lineAt(diagnostic.range.start.line).text;
+            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;
+            suppressAction.diagnostics = [diagnostic];
+            actions.push(suppressAction);
+
+            // Set up one action for suppressing warning of a given type universally
+            const suppressTypeAction = new vscode.CodeAction(
+                `Suppress warning type ${diagnosticCode} universally`,
+                vscode.CodeActionKind.QuickFix
+            );
+
+            suppressTypeAction.command = {
+                command: "cppcheck-official.suppressWarningAll",
+                title: "Suppress warning here",
+                arguments: [diagnostic]
+            };
+
+            suppressTypeAction.diagnostics = [diagnostic];
+            actions.push(suppressTypeAction);
+        }
+
+        return actions;
+    }
+}

src/util/diagnostics.ts

@@ -1,65 +1,5 @@
 import * as vscode from 'vscode';
 
-export class CodeActionProvider implements vscode.CodeActionProvider {
-    provideCodeActions(
-        document: vscode.TextDocument,
-        range: vscode.Range,
-        context: vscode.CodeActionContext,
-        token: vscode.CancellationToken
-    ): vscode.CodeAction[] {
-
-        const actions: vscode.CodeAction[] = [];
-
-        for (const diagnostic of context.diagnostics) {
-            var diagnosticCode = diagnostic.code;
-            if (typeof(diagnosticCode) === "object" && typeof(diagnosticCode) !== null) {
-                diagnosticCode = diagnosticCode.value;
-            }
-            
-            // Set up one action for suppressing the specific warning on the line targeted by the diagnostic
-            const suppressAction = new vscode.CodeAction(
-                `Suppress warning for ${diagnosticCode} here`,
-                vscode.CodeActionKind.QuickFix
-            );
-
-            // Copy indentation from line affected by diagnostic
-            const lineText = document.lineAt(diagnostic.range.start.line).text;
-            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;
-            suppressAction.diagnostics = [diagnostic];
-            actions.push(suppressAction);
-
-            // Set up one action for suppressing warning of a given type universally
-            const suppressTypeAction = new vscode.CodeAction(
-                `Suppress warning type ${diagnosticCode} universally`,
-                vscode.CodeActionKind.QuickFix
-            );
-
-            suppressTypeAction.command = {
-                command: "cppcheck-official.suppressWarningAll",
-                title: "Suppress warning here",
-                arguments: [diagnostic]
-            };
-
-            suppressTypeAction.diagnostics = [diagnostic];
-            actions.push(suppressTypeAction);
-        }
-
-        return actions;
-    }
-}
-
 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