Merge pull request #82 from kuuote/volatile

RFC: 走ってるソースあってもvolatile効くようにしてみた
Shougo · Nov 1, 2023 · b28f565 · b28f565
2 parents 0fffa32 + c9c4abb
commit b28f565
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/denops/ddu/app.ts b/denops/ddu/app.ts
@@ -238,6 +238,24 @@ export function main(denops: Denops) {
     async redraw(arg1: unknown, arg2: unknown): Promise<void> {
       queuedName = ensure(arg1, is.String);
       queuedRedrawOption = ensure(arg2, is.Record) as RedrawOption;
+      const ddu = getDdu(queuedName);
+      // Check volatile sources
+      const volatiles = [];
+      let index = 0;
+      for (const sourceArgs of ddu.getSourceArgs()) {
+        if (sourceArgs[0].volatile) {
+          volatiles.push(index);
+        }
+        index++;
+      }
+      if (
+        queuedRedrawOption?.refreshItems ||
+        queuedRedrawOption?.updateOptions ||
+        volatiles.length > 0
+      ) {
+        ddu.cancelToRefresh();
+        ddu.resetCancelledToRefresh();
+      }
 
       // NOTE: must be locked
       await lock.lock(async () => {

diff --git a/denops/ddu/ddu.ts b/denops/ddu/ddu.ts
@@ -787,12 +787,12 @@ export class Ddu {
     this.resetAbortController();
   }
 
-  private cancelToRefresh() {
+  cancelToRefresh() {
     this.cancelledToRefresh = true;
     this.abortController.abort("cancelToRefresh");
   }
 
-  private resetCancelledToRefresh() {
+  resetCancelledToRefresh() {
     this.cancelledToRefresh = false;
     this.resetAbortController();
   }