Minor refactorings

sorenlouv · Jan 19, 2022 · 26e2ee9 · 26e2ee9
1 parent b8c4abd
commit 26e2ee9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,13 @@
     "yarn.lock": true,
     "coverage": true
   },
+  "search.exclude": {
+    "**/node_modules": true,
+    "**/bower_components": true,
+    "**/*.code-search": true,
+    "CODE_OF_CONDUCT.md": true,
+    "github-schema.graphql": true
+  },
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true

diff --git a/src/services/prompts.ts b/src/services/prompts.ts
@@ -109,12 +109,12 @@ export function getChoicesForCommitPrompt(
     if (showDetails) {
       const message = stripPullNumber(c.originalMessage);
       const prLink = c.pullUrl ? ` ` + getPrLink(c.pullNumber, c.pullUrl) : '';
-      const detailsList = getDetailedPullStatus(c);
-      name = `${position}${message}${prLink}${detailsList}`;
+      const pullStatus = getDetailedPullStatus(c);
+      name = `${position}${message}${prLink}${pullStatus}`;
     } else {
       const message = getFirstLine(c.originalMessage);
-      const pullStates = getSimplePullStatus(c);
-      name = `${position}${message} ${pullStates}`;
+      const pullStatus = getSimplePullStatus(c);
+      name = `${position}${message} ${pullStatus}`;
     }
 
     const short = c.pullNumber

diff --git a/src/ui/getCommits.ts b/src/ui/getCommits.ts
@@ -53,19 +53,14 @@ export async function getCommits(options: ValidConfigOptions) {
       );
     }
 
-    if (options.prFilter) {
-      spinner.text = 'Loading pull requests...';
-      const commitChoices = await fetchPullRequestBySearchQuery(options);
-      spinner.stop();
-      return promptForCommits({
-        commitChoices,
-        isMultipleChoice: options.multipleCommits,
-        showDetails: options.details,
-      });
-    }
+    spinner.text = options.prFilter
+      ? 'Loading pull requests...'
+      : `Loading commits from branch "${options.sourceBranch}"...`;
+
+    const commitChoices = options.prFilter
+      ? await fetchPullRequestBySearchQuery(options)
+      : await fetchCommitsByAuthor(options);
 
-    spinner.text = `Loading commits from branch "${options.sourceBranch}"...`;
-    const commitChoices = await fetchCommitsByAuthor(options);
     spinner.stop();
     return promptForCommits({
       commitChoices,