Fix replace one occurence

jupyterlab · Jan 4, 2022 · e535731 · e535731
1 parent d325e50
commit e535731
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/packages/cells/src/searchprovider.ts b/packages/cells/src/searchprovider.ts
@@ -120,6 +120,11 @@ export class CellSearchProvider implements IDisposable, IBaseSearchProvider {
     if (this.matchesSize === 0 || !this.isActive) {
       this.currentIndex = null;
     } else {
+      if (this._lastReplacementPosition) {
+        this.cell.editor.setCursorPosition(this._lastReplacementPosition);
+        this._lastReplacementPosition = null;
+      }
+
       // This starts from the cursor position
       let match = await this.cmHandler.highlightNext();
       if (match) {
@@ -266,11 +271,6 @@ export class CellSearchProvider implements IDisposable, IBaseSearchProvider {
           this.query,
           content.text
         );
-        if (this._lastReplacementPosition) {
-          this.cell.editor.setCursorPosition(this._lastReplacementPosition);
-          this._lastReplacementPosition = null;
-          this.highlightNext();
-        }
       } else {
         this.cmHandler.matches = [];
       }

diff --git a/packages/notebook/src/searchprovider.ts b/packages/notebook/src/searchprovider.ts
@@ -226,31 +226,32 @@ export class NotebookSearchProvider extends SearchProvider<NotebookPanel> {
   async replaceCurrentMatch(newText: string, loop = true): Promise<boolean> {
     let replaceOccurred = false;
 
-    if (this._currentProviderIndex !== null) {
+    const unrenderMarkdownCell = async (
+      highlightNext = false
+    ): Promise<void> => {
       // Unrendered markdown cell
       const activeCell = this.widget?.content.activeCell;
       if (
         activeCell?.model.type === 'markdown' &&
         (activeCell as MarkdownCell).rendered
       ) {
         (activeCell as MarkdownCell).rendered = false;
+        if (highlightNext) {
+          await this.highlightNext(loop);
+        }
       }
+    };
+
+    if (this._currentProviderIndex !== null) {
+      await unrenderMarkdownCell();
 
       const searchEngine = this._searchProviders[this._currentProviderIndex];
       replaceOccurred = await searchEngine.replaceCurrentMatch(newText);
     }
-    if (!replaceOccurred) {
-      await this.highlightNext(loop);
-    }
 
-    // Unrendered markdown cell
-    const activeCell = this.widget?.content.activeCell;
-    if (
-      activeCell?.model.type === 'markdown' &&
-      (activeCell as MarkdownCell).rendered
-    ) {
-      (activeCell as MarkdownCell).rendered = false;
-    }
+    await this.highlightNext(loop);
+    // Force highlighting the first hit in the unrendered cell
+    await unrenderMarkdownCell(true);
     return replaceOccurred;
   }