chore: unify add finding to region implementations

Author: fcasal

src/codeMarker.ts

@@ -3167,69 +3167,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> {
-        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;
-        }
-
-        vscode.window
-            .showQuickPick(items, {
-                ignoreFocusOut: true,
-                title: "Select the finding to add the region to",
-            })
-            .then((pickItem) => {
-                if (pickItem === undefined) {
-                    return;
-                }
-                const entry = pickItem.entry;
-                // Add each selection as a separate region
-                for (const location of locations) {
-                    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 });
-                }
-            });
-    }
-
-    /**
-     * Add the selected code region to an existing entry, prompting for a label
-     */
-    async addRegionToAnEntryWithLabel(): Promise<void> {
+    private async addRegionToEntryWithOptionalLabel(getLabel?: () => Promise<string | undefined>): Promise<void> {
         const editor = vscode.window.activeTextEditor;
         if (editor === undefined) {
             return;
@@ -3269,19 +3211,20 @@ export class CodeMarker implements vscode.TreeDataProvider<TreeEntry> {
             return;
         }
 
-        const label = await vscode.window.showInputBox({
-            title: "Enter a label for this location",
-            ignoreFocusOut: true,
-        });
-
-        if (label === undefined) {
-            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 with the label
+        // Add each selection as a separate region, optionally tagging with the provided label
         for (const location of locations) {
-            location.label = label;
+            if (label !== undefined) {
+                location.label = label;
+            }
             entry.locations.push(location);
         }
         this.updateSavedData(entry.author);
@@ -3295,6 +3238,25 @@ 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> {
+        await this.addRegionToEntryWithOptionalLabel(async () =>
+            vscode.window.showInputBox({
+                title: "Enter a label for this location",
+                ignoreFocusOut: true,
+            }),
+        );
+    }
+
     /**
      * Loads the saved findings from a file
      * @param config  the configuration to load from