Call columns after filters

Shougo · Jan 4, 2024 · ee729b0 · ee729b0
1 parent dcaa48b
commit ee729b0
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/denops/ddu/ddu.ts b/denops/ddu/ddu.ts
@@ -1258,13 +1258,9 @@ export class Ddu {
           parent,
         )
       ) {
-        await this.#callColumns(
-          denops,
-          sourceOptions.columns,
-          [parent].concat(newItems),
-        );
         children = children.concat(newItems);
       }
+
       if (this.shouldStopCurrentContext()) {
         return;
       }
@@ -1280,6 +1276,12 @@ export class Ddu {
         this.#input,
         children,
       );
+
+      await this.#callColumns(
+        denops,
+        sourceOptions.columns,
+        children,
+      );
     } finally {
       // Restore path
       this.#context.path = savePath;
@@ -1411,6 +1413,7 @@ export class Ddu {
 
       this.#setUnexpanded(convertTreePath(item.treePath));
       item.__expanded = false;
+
       await this.#callColumns(denops, sourceOptions.columns, [item]);
 
       await ui.collapseItem({
@@ -1806,9 +1809,6 @@ export class Ddu {
     let items = structuredClone(state.items);
     const allItems = items.length;
 
-    // NOTE: Call columns before filters
-    await this.#callColumns(denops, sourceOptions.columns, items);
-
     items = await this.#callFilters(
       denops,
       sourceOptions,
@@ -1830,6 +1830,9 @@ export class Ddu {
       items,
     );
 
+    // NOTE: Call columns after filters
+    await this.#callColumns(denops, sourceOptions.columns, items);
+
     return [state.done, allItems, items];
   }