Add initialItems and initialQuery to MatchProcessor

Author: lambdalisue

denops/fall/processor/match.ts

@@ -13,7 +13,9 @@ const THRESHOLD = 100000;
 const CHUNK_SIZE = 1000;
 const CHUNK_INTERVAL = 100;
 
-export type MatchProcessorOptions = {
+export type MatchProcessorOptions<T extends Detail> = {
+  initialItems?: readonly IdItem<T>[];
+  initialQuery?: string;
   initialIndex?: number;
   interval?: number;
   threshold?: number;
@@ -32,11 +34,12 @@ export class MatchProcessor<T extends Detail> implements Disposable {
   #controller: AbortController = new AbortController();
   #processing?: Promise<void>;
   #reserved?: () => void;
-  #items: IdItem<T>[] = [];
+  #items: IdItem<T>[];
+  #previousQuery?: string;
 
   constructor(
     matchers: readonly [Matcher<T>, ...Matcher<T>[]],
-    options: MatchProcessorOptions = {},
+    options: MatchProcessorOptions<T> = {},
   ) {
     this.matchers = new ItemBelt(matchers, {
       index: options.initialIndex,
@@ -46,6 +49,8 @@ export class MatchProcessor<T extends Detail> implements Disposable {
     this.#chunkSize = options.chunkSize ?? CHUNK_SIZE;
     this.#chunkInterval = options.chunkInterval ?? CHUNK_INTERVAL;
     this.#incremental = options.incremental ?? false;
+    this.#items = options.initialItems?.slice() ?? [];
+    this.#previousQuery = options.initialQuery;
   }
 
   get #matcher(): Matcher<T> {
@@ -88,7 +93,12 @@ export class MatchProcessor<T extends Detail> implements Disposable {
     options?: { restart?: boolean },
   ): void {
     this.#validateAvailability();
-    if (this.#processing) {
+    if (query === this.#previousQuery) {
+      if (!this.#processing) {
+        dispatch({ type: "match-processor-succeeded" });
+      }
+      return;
+    } else if (this.#processing) {
       // Keep most recent start request for later.
       this.#reserved = () => this.start(denops, { items, query }, options);
       // If restart is requested, we need to abort the current processing.
@@ -101,6 +111,7 @@ export class MatchProcessor<T extends Detail> implements Disposable {
     }
     this.#processing = (async () => {
       dispatch({ type: "match-processor-started" });
+      this.#previousQuery = query;
       const signal = this.#controller.signal;
       const iter = take(
         this.#matcher.match(denops, { items, query }, { signal }),

denops/fall/processor/match_test.ts

@@ -399,19 +399,19 @@ Deno.test("MatchProcessor", async (t) => {
       );
       processor.start(denops, {
         items: [{ id: 0, value: "0", detail: {} }],
-        query: "",
+        query: "q0",
       });
       processor.start(denops, {
         items: [{ id: 1, value: "1", detail: {} }],
-        query: "",
+        query: "q1",
       });
       processor.start(denops, {
         items: [{ id: 2, value: "2", detail: {} }],
-        query: "",
+        query: "q2",
       });
       processor.start(denops, {
         items: [{ id: 3, value: "3", detail: {} }],
-        query: "",
+        query: "q3",
       });
 
       assertEquals(called, []);
@@ -450,32 +450,32 @@ Deno.test("MatchProcessor", async (t) => {
       );
       processor.start(denops, {
         items: [{ id: 0, value: "0", detail: {} }],
-        query: "",
+        query: "q0",
       }, { restart: true });
       processor.start(denops, {
         items: [{ id: 1, value: "1", detail: {} }],
-        query: "",
+        query: "q1",
       }, { restart: true });
       processor.start(denops, {
         items: [{ id: 2, value: "2", detail: {} }],
-        query: "",
+        query: "q2",
       }, { restart: true });
       processor.start(denops, {
         items: [{ id: 3, value: "3", detail: {} }],
-        query: "",
+        query: "q3",
       }, { restart: true });
 
       assertEquals(called, []);
 
       notify.notify();
       await flushPromises();
 
-      assertEquals(called, []);
+      assertEquals(called, [0]);
 
       notify.notify();
       await flushPromises();
 
-      assertEquals(called, [3]);
+      assertEquals(called, [0, 3]);
     },
   );