chore: pull in changes from main in extension.ts

Author: MichaelCurrin

src/extension.ts

@@ -1,21 +1,48 @@
 /**
  * Extension module.
  *
- * This sets up the extension's command entry point and applies the prepare commit message module to
- * a target branch.
+ * This sets up the VS Code extension's command entry-point and applies logic in
+ * the prepareCommitMsg module to a target branch.
  */
 import * as vscode from "vscode";
 import { API } from "./api/git";
 import { makeAndFillCommitMsg } from "./autofill";
 import { getGitExtension } from "./gitExtension";
 
+function _validateFoundRepos(git: API) {
+  let msg = "";
+
+  if (!git) {
+    msg = "Unable to load Git Extension";
+  } else if (git.repositories.length === 0) {
+    msg =
+      "No repos found. Please open a repo or run `git init` then try again.";
+  }
+
+  if (msg) {
+    vscode.window.showErrorMessage(msg);
+
+    throw new Error(msg);
+  }
+}
+
 /**
- * Flow for multiple repos in workspace and selecting just one. This is a rare flow.
+ * Run autofill against one of multiples in the workspace.
+ *
+ * This is a rare flow.
+ *
+ * @param sourceControl Of type `vscode.SourceControl` with public `.rootUri`
+ *   and private `.rootUri`.
  */
-async function _handleRepos(git: API, uri: any) {
-  // FIXME: Unfortunately this seems to only pick up the first repo and not find second etc.
+async function _handleRepos(git: API, sourceControl: any) {
+  // FIXME: Unfortunately this seems to only pick up the first repo and not find
+  // second, etc.
   const selectedRepository = git.repositories.find(repository => {
-    return repository.rootUri.path === uri._rootUri.path;
+    const uri = sourceControl._rootUri;
+    if (!uri) {
+      console.warn("_rootUri not set");
+    }
+    return repository.rootUri.path === uri.path;
   });
 
   if (selectedRepository) {
@@ -26,28 +53,19 @@ async function _handleRepos(git: API, uri: any) {
 }
 
 /**
- * Flow for a single or zero repos in the workspace.
+ * Run autofill flow for a single repo in the workspace.
  */
 async function _handleRepo(git: API) {
   const targetRepo = git.repositories[0];
-
   await makeAndFillCommitMsg(targetRepo);
 }
 
-async function _autofill(uri?: string) {
-  const git = getGitExtension();
-
-  if (!git) {
-    vscode.window.showErrorMessage("Unable to load Git Extension");
-    return;
-  }
-
-  if (git.repositories.length === 0) {
-    vscode.window.showErrorMessage(
-      "No repos found. Please open a repo or run git init then try this extension again."
-    );
-    return;
-  }
+/**
+ * Choose the relevant repo and apply autofill logic on files there.
+ */
+async function _chooseRepoForAutofill(uri?: vscode.Uri) {
+  const git = getGitExtension()!;
+  _validateFoundRepos(git);
 
   vscode.commands.executeCommand("workbench.view.scm");
 
@@ -59,16 +77,20 @@ async function _autofill(uri?: string) {
 }
 
 /**
- * Set up this extension's autofill command to run when triggered.
+ * Set up the extension activation.
+ *
+ * The autofill command as configured in `package.json` will be triggered
+ * and run the autofill logic for a repo.
  */
 export function activate(context: vscode.ExtensionContext) {
   const disposable = vscode.commands.registerCommand(
     "commitMsg.autofill",
-    _autofill
+    _chooseRepoForAutofill
   );
 
   context.subscriptions.push(disposable);
 }
 
+// prettier-ignore
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-export function deactivate() {}
+export function deactivate() { }