fix(incsearch): viewport is not updating during searching (#1575)

vscode-neovim · Oct 29, 2023 · b8696a3 · b8696a3
1 parent 85057b8
commit b8696a3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/highlight_manager.ts b/src/highlight_manager.ts
@@ -16,7 +16,9 @@ export class HighlightManager implements Disposable {
         this.disposables.push(eventBus.on("redraw", this.handleRedraw, this));
     }
 
-    private handleRedraw(data: EventBusData<"redraw">): void {
+    private async handleRedraw(data: EventBusData<"redraw">): Promise<void> {
+        await this.main.viewportManager.isSyncDone;
+
         const gridHLUpdates: Set<number> = new Set();
 
         for (const { name, args } of data) {

diff --git a/src/mode_manager.ts b/src/mode_manager.ts
@@ -43,6 +43,9 @@ export class Mode {
     public get isNormal(): boolean {
         return this.name === "normal";
     }
+    public get isCmdline(): boolean {
+        return this.name === "cmdline";
+    }
 }
 export class ModeManager implements Disposable {
     private disposables: Disposable[] = [];
@@ -87,6 +90,10 @@ export class ModeManager implements Disposable {
         return this.mode.isNormal;
     }
 
+    public get isCmdlineMode(): boolean {
+        return this.mode.isCmdline;
+    }
+
     public get isRecordingInInsertMode(): boolean {
         return this.isRecording;
     }

diff --git a/src/viewport_manager.ts b/src/viewport_manager.ts
@@ -5,7 +5,7 @@ import { config } from "./config";
 import { EventBusData, eventBus } from "./eventBus";
 import { createLogger } from "./logger";
 import { MainController } from "./main_controller";
-import { disposeAll } from "./utils";
+import { ManualPromise, disposeAll } from "./utils";
 
 const logger = createLogger("ViewportManager");
 
@@ -27,6 +27,8 @@ export class ViewportManager implements Disposable {
      */
     private gridViewport: Map<number, Viewport> = new Map();
 
+    private syncViewportPromise?: ManualPromise;
+
     private get client() {
         return this.main.client;
     }
@@ -48,6 +50,10 @@ export class ViewportManager implements Disposable {
         );
     }
 
+    public get isSyncDone(): Promise<void> {
+        return Promise.resolve(this.syncViewportPromise?.promise);
+    }
+
     /**
      * Get viewport data
      * @param gridId: grid id
@@ -76,7 +82,7 @@ export class ViewportManager implements Disposable {
         return new Position(view.topline, view.leftcol);
     }
 
-    private handleRedraw(data: EventBusData<"redraw">) {
+    private async handleRedraw(data: EventBusData<"redraw">) {
         for (const { name, args } of data) {
             switch (name) {
                 case "win_viewport": {
@@ -87,6 +93,27 @@ export class ViewportManager implements Disposable {
                         view.line = curline;
                         view.col = curcol;
                     }
+                    // #1555
+                    if (this.main.modeManager.isCmdlineMode && !this.syncViewportPromise) {
+                        this.syncViewportPromise = new ManualPromise();
+                        try {
+                            const [currWin, currView] = (await this.client.lua(
+                                "return {vim.api.nvim_get_current_win(), vim.fn.winsaveview()}",
+                            )) as [number, any];
+                            const grid = this.main.bufferManager.getGridIdForWinId(currWin);
+                            if (grid) {
+                                const view = this.getViewport(grid);
+                                view.line = currView.lnum - 1;
+                                view.col = currView.col;
+                                view.topline = currView.topline - 1;
+                                view.leftcol = currView.leftcol;
+                                view.skipcol = currView.skipcol;
+                            }
+                        } finally {
+                            this.syncViewportPromise.resolve();
+                            this.syncViewportPromise = undefined;
+                        }
+                    }
                     break;
                 }
                 case "grid_destroy": {