From 1317dfa58118a2aa8e64481f11bdb2c5804ea3e1 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Tue, 25 Apr 2023 15:44:53 +0100
Subject: [PATCH] Pull out getFromQueryToCompare

---
 .../query-history/query-history-manager.ts    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts
index dd6407347..7b7096408 100644
--- a/extensions/ql-vscode/src/query-history/query-history-manager.ts
+++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts
@@ -592,12 +592,7 @@ export class QueryHistoryManager extends DisposableObject {
       );
     }
 
-    const fromItem =
-      this.compareWithItem &&
-      this.isSuccessfulCompletedLocalQueryInfo(this.compareWithItem) &&
-      multiSelect.includes(this.compareWithItem)
-        ? this.compareWithItem
-        : singleItem;
+    const fromItem = this.getFromQueryToCompare(singleItem, multiSelect);
 
     let toItem: CompletedLocalQueryInfo | undefined = undefined;
     try {
@@ -1070,6 +1065,21 @@ export class QueryHistoryManager extends DisposableObject {
     }
   }
 
+  private getFromQueryToCompare(
+    singleItem: CompletedLocalQueryInfo,
+    multiSelect: CompletedLocalQueryInfo[],
+  ): CompletedLocalQueryInfo {
+    if (
+      this.compareWithItem &&
+      this.isSuccessfulCompletedLocalQueryInfo(this.compareWithItem) &&
+      multiSelect.includes(this.compareWithItem)
+    ) {
+      return this.compareWithItem;
+    } else {
+      return singleItem;
+    }
+  }
+
   private async findOtherQueryToCompare(
     fromItem: CompletedLocalQueryInfo,
     allItemsSelected: CompletedLocalQueryInfo[],