Fix ui.quit() when onEvent

Shougo · Jul 3, 2024 · d87fbf8 · d87fbf8
1 parent bec4b27
commit d87fbf8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ lint:
 	deno check ${TS}
 	deno fmt --check denops
 	deno test --no-run -A ${TS}
-	deno lint denops
+	deno lint denops --ignore=denops/ddu/_mod.js
 
 test:
 	deno test -A ${TSTEST}

diff --git a/denops/ddu/ddu.ts b/denops/ddu/ddu.ts
@@ -54,6 +54,7 @@ import {
   getUi,
   initSource,
   sourceArgs,
+  uiQuit,
   uiRedraw,
   uiSearchItem,
 } from "./ext.ts";
@@ -112,22 +113,12 @@ export class Ddu {
 
     if (uiChanged) {
       // Quit current UI
-      const [ui, uiOptions, uiParams] = await getUi(
+      await uiQuit(
         denops,
         this.#loader,
+        this.#context,
         this.#options,
       );
-      if (!ui) {
-        return;
-      }
-      await ui.quit({
-        denops,
-        context: this.#context,
-        options: this.#options,
-        uiOptions,
-        uiParams,
-      });
-      ui.prevDone = false;
       this.quit();
     }
 
@@ -277,22 +268,12 @@ export class Ddu {
     userOptions: UserOptions,
   ): Promise<void> {
     // Quit current UI
-    const [ui, uiOptions, uiParams] = await getUi(
+    await uiQuit(
       denops,
       this.#loader,
+      this.#context,
       this.#options,
     );
-    if (!ui) {
-      return;
-    }
-    await ui.quit({
-      denops,
-      context: this.#context,
-      options: this.#options,
-      uiOptions,
-      uiParams,
-    });
-    ui.prevDone = false;
     this.quit();
 
     // Disable resume
@@ -870,6 +851,16 @@ export class Ddu {
         event,
       });
     }
+
+    if (event === "close" || event === "cancel") {
+      // Quit event
+      await uiQuit(
+        denops,
+        this.#loader,
+        this.#context,
+        this.#options,
+      );
+    }
   }
 
   quit() {

diff --git a/denops/ddu/ext.ts b/denops/ddu/ext.ts
@@ -991,6 +991,33 @@ export async function uiRedraw<
   });
 }
 
+export async function uiQuit<
+  Params extends BaseUiParams,
+>(
+  denops: Denops,
+  loader: Loader,
+  context: Context,
+  options: DduOptions,
+): Promise<void> {
+  // Quit current UI
+  const [ui, uiOptions, uiParams] = await getUi(
+    denops,
+    loader,
+    options,
+  );
+  if (!ui) {
+    return;
+  }
+  await ui.quit({
+    denops,
+    context,
+    options,
+    uiOptions,
+    uiParams,
+  });
+  ui.prevDone = false;
+}
+
 async function checkFilterOnInit(
   filter: BaseFilter<BaseFilterParams>,
   denops: Denops,