Check expandedItems are exists in this.#items

Shougo · Jun 2, 2024 · a77be8b · a77be8b
1 parent 6143d17
commit a77be8b
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/denops/ddu/ddu.ts b/denops/ddu/ddu.ts
@@ -1133,7 +1133,7 @@ export class Ddu {
 
       await this.refresh(denops);
 
-      if (searchPath.length > 0) {
+      if (searchPath.length <= 0) {
         // NOTE: If searchPath exists, expandItems() is executed.
         await this.restoreTree(denops);
       }
@@ -1756,16 +1756,21 @@ export class Ddu {
   async restoreTree(
     denops: Denops,
   ): Promise<void> {
-    if (this.#expandedItems.size === 0) {
+    // NOTE: Check expandedItems are exists in this.#items
+    const checkItems: Map<string, DduItem> = new Map();
+    for (const item of this.#items) {
+      checkItems.set(item2Key(item), item);
+    }
+
+    const restoreItems = [...this.#expandedItems.values()].filter((item) =>
+      checkItems.has(item2Key(item))
+    ).map((item) => ({ item }));
+
+    if (restoreItems.length === 0) {
       return;
     }
 
-    await this.expandItems(
-      denops,
-      [...this.#expandedItems.values()].map((item) => ({
-        item,
-      })),
-    );
+    await this.expandItems(denops, restoreItems);
   }
 
   async #filterItems(