chore: unify add finding to region implementations

Author: fcasal

src/codeMarker.ts

@@ -2015,7 +2015,7 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
         });
 
         vscode.commands.registerCommand("weAudit.addRegionToAnEntryWithLabel", () => {
-            this.addRegionToAnEntryWithLabel();
+            void this.addRegionToAnEntryWithLabel();
         });
 
         vscode.commands.registerCommand("weAudit.deleteLocation", (entry: FullLocationEntry) => {
@@ -3173,9 +3173,11 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
     }
 
     /**
-     * Add the selected code region to an existing entry
+     * Shared helper that adds the current editor selection(s) to an existing entry.
+     * Optionally prompts for a label that is applied to each new location.
+     * @param getLabel function that resolves to the label to assign, or undefined to skip labeling
      */
-    async addRegionToAnEntry(): Promise<void> {
+    private async addRegionToEntryWithOptionalLabel(getLabel?: () => Promise<string | undefined>): Promise<void> {
         const editor = vscode.window.activeTextEditor;
         if (editor === undefined) {
             return;
@@ -3215,12 +3217,23 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
             return;
         }
 
+        let label: string | undefined;
+        if (getLabel) {
+            label = await getLabel();
+            if (label === undefined) {
+                return;
+            }
+        }
+
         const entry = pickItem.entry;
-        // Add each selection as a separate region
+        // Add each selection as a separate region, optionally tagging with the provided label
         for (const location of locations) {
+            if (label !== undefined) {
+                location.label = label;
+            }
             entry.locations.push(location);
         }
-        void this.updateSavedData(entry.author);
+        this.updateSavedData(entry.author);
         this.decorateWithUri(editor.document.uri);
         this.refresh(editor.document.uri);
         // reveal the entry in the tree view if the treeview is visible,
@@ -3231,73 +3244,23 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
         }
     }
 
+    /**
+     * Add the selected code region to an existing entry
+     */
+    async addRegionToAnEntry(): Promise<void> {
+        await this.addRegionToEntryWithOptionalLabel();
+    }
+
     /**
      * Add the selected code region to an existing entry, prompting for a label
      */
     async addRegionToAnEntryWithLabel(): Promise<void> {
-        const editor = vscode.window.activeTextEditor;
-        if (editor === undefined) {
-            return;
-        }
-        const locations = this.getActiveSelectionLocation();
-        if (locations === undefined || locations.length === 0) {
-            return;
-        }
-
-        // create a quick pick to select the entry to add the region to
-        const items = this.treeEntries
-            .filter((entry) => {
-                if (entry.locations.length === 0 || entry.locations[0].rootPath !== locations[0].rootPath) {
-                    return false;
-                }
-                return true;
-            })
-            .map((entry) => {
-                return {
-                    label: entry.label,
-                    entry: entry,
-                };
-            });
-
-        // if we have no findings so far, create a new one
-        if (items.length === 0) {
-            this.addFinding();
-            return;
-        }
-
-        const pickItem = await vscode.window.showQuickPick(items, {
-            ignoreFocusOut: true,
-            title: "Select the finding to add the region to",
-        });
-
-        if (pickItem === undefined) {
-            return;
-        }
-
-        const label = await vscode.window.showInputBox({
-            title: "Enter a label for this location",
-            ignoreFocusOut: true,
-        });
-
-        if (label === undefined) {
-            return;
-        }
-
-        const entry = pickItem.entry;
-        // Add each selection as a separate region with the label
-        for (const location of locations) {
-            location.label = label;
-            entry.locations.push(location);
-        }
-        this.updateSavedData(entry.author);
-        this.decorateWithUri(editor.document.uri);
-        this.refresh(editor.document.uri);
-        // reveal the entry in the tree view if the treeview is visible,
-        // for some reason, it won't expand even if though it is created
-        // with an expanded state
-        if (treeView.visible) {
-            treeView.reveal(entry, { expand: 1, select: false });
-        }
+        await this.addRegionToEntryWithOptionalLabel(async () =>
+            vscode.window.showInputBox({
+                title: "Enter a label for this location",
+                ignoreFocusOut: true,
+            }),
+        );
     }
 
     /**