From 3c7404e9c5d42528589b7e1643955eef10ccf6bd Mon Sep 17 00:00:00 2001
From: Jason Weill <jweill@amazon.com>
Date: Thu, 2 May 2024 17:04:48 -0700
Subject: [PATCH] Simplifies loop logic, avoiding if case

---
 packages/notebook/src/searchprovider.ts | 88 ++++++++++++-------------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/packages/notebook/src/searchprovider.ts b/packages/notebook/src/searchprovider.ts
index 830d91050e53..00e13c10fa9e 100644
--- a/packages/notebook/src/searchprovider.ts
+++ b/packages/notebook/src/searchprovider.ts
@@ -666,60 +666,54 @@ export class NotebookSearchProvider extends SearchProvider<NotebookPanel> {
       this._searchProviders[this._currentProviderIndex].currentMatchIndex ===
         null;
 
+    const startIndex = this._currentProviderIndex;
+    // If we're at the end of the last cell in the provider list and we need to loop, do so
     if (
-      from !== 'previous-match' ||
-      !atEndOfCurrentCell ||
-      (!loop && this._currentProviderIndex + 1 < this._searchProviders.length)
+      loop &&
+      atEndOfCurrentCell &&
+      this._currentProviderIndex + 1 >= this._searchProviders.length
     ) {
-      const startIndex = this._currentProviderIndex;
-      // If we're at the end of the last cell in the provider list and we need to loop, do so
-      if (
-        loop &&
-        atEndOfCurrentCell &&
-        this._currentProviderIndex + 1 >= this._searchProviders.length
-      ) {
-        this._currentProviderIndex = 0;
-      } else {
-        this._currentProviderIndex += atEndOfCurrentCell ? 1 : 0;
-      }
-      do {
-        const searchEngine = this._searchProviders[this._currentProviderIndex];
+      this._currentProviderIndex = 0;
+    } else {
+      this._currentProviderIndex += atEndOfCurrentCell ? 1 : 0;
+    }
+    do {
+      const searchEngine = this._searchProviders[this._currentProviderIndex];
 
-        const match = reverse
-          ? await searchEngine.highlightPrevious(false, options)
-          : await searchEngine.highlightNext(false, options);
+      const match = reverse
+        ? await searchEngine.highlightPrevious(false, options)
+        : await searchEngine.highlightNext(false, options);
 
-        if (match) {
-          await activateNewMatch(match);
-          return match;
-        } else {
-          this._currentProviderIndex =
-            this._currentProviderIndex + (reverse ? -1 : 1);
+      if (match) {
+        await activateNewMatch(match);
+        return match;
+      } else {
+        this._currentProviderIndex =
+          this._currentProviderIndex + (reverse ? -1 : 1);
 
-          if (loop) {
-            this._currentProviderIndex =
-              (this._currentProviderIndex + this._searchProviders.length) %
-              this._searchProviders.length;
-          }
+        if (loop) {
+          this._currentProviderIndex =
+            (this._currentProviderIndex + this._searchProviders.length) %
+            this._searchProviders.length;
         }
-      } while (
-        loop
-          ? // We looped on all cells, no hit found
-            this._currentProviderIndex !== startIndex
-          : 0 <= this._currentProviderIndex &&
-            this._currentProviderIndex < this._searchProviders.length
-      );
+      }
+    } while (
+      loop
+        ? // We looped on all cells, no hit found
+          this._currentProviderIndex !== startIndex
+        : 0 <= this._currentProviderIndex &&
+          this._currentProviderIndex < this._searchProviders.length
+    );
 
-      if (loop) {
-        // try the first provider again
-        const searchEngine = this._searchProviders[startIndex];
-        const match = reverse
-          ? await searchEngine.highlightPrevious(false, options)
-          : await searchEngine.highlightNext(false, options);
-        if (match) {
-          await activateNewMatch(match);
-          return match;
-        }
+    if (loop) {
+      // try the first provider again
+      const searchEngine = this._searchProviders[startIndex];
+      const match = reverse
+        ? await searchEngine.highlightPrevious(false, options)
+        : await searchEngine.highlightNext(false, options);
+      if (match) {
+        await activateNewMatch(match);
+        return match;
       }
     }