Fix restoreTree()

Author: Shougo

denops/ddu/ddu.ts

@@ -24,7 +24,7 @@ import {
 import { defaultSourceOptions } from "./base/source.ts";
 import type { BaseSource } from "./base/source.ts";
 import type { Loader } from "./loader.ts";
-import { convertUserString, printError, treePath2Filename } from "./utils.ts";
+import { convertTreePath, convertUserString, printError, treePath2Filename } from "./utils.ts";
 import type {
   AvailableSourceInfo,
   GatherStateAbortable,
@@ -723,6 +723,10 @@ export class Ddu {
       items: allItems,
     });
 
+    if (restoreTree) {
+      await this.restoreTree(denops, { preventRedraw: true, signal });
+    }
+
     const searchPath = this.#searchPath;
 
     let searchTargetItem: DduItem | undefined;
@@ -771,10 +775,6 @@ export class Ddu {
       }
     }));
 
-    if (restoreTree) {
-      this.restoreTree(denops, { preventRedraw: true, signal });
-    }
-
     if (this.#context.done && this.#options.profile) {
       await printError(
         denops,
@@ -1926,14 +1926,6 @@ function chompTreePath(treePath?: TreePath): TreePath {
   return treePath;
 }
 
-function convertTreePath(treePath?: TreePath): string[] {
-  return typeof treePath === "string"
-    ? treePath.split(pathsep)
-    : !treePath
-    ? []
-    : treePath;
-}
-
 function isParentPath(checkPath: string[], searchPath: string[]) {
   return checkPath !== searchPath &&
     searchPath.join(pathsep).startsWith(checkPath.join(pathsep) + pathsep);

denops/ddu/utils.ts

@@ -35,6 +35,14 @@ export function treePath2Filename(treePath: TreePath): string {
   return typeof treePath === "string" ? treePath : treePath.join(pathsep);
 }
 
+export function convertTreePath(treePath?: TreePath): string[] {
+  return typeof treePath === "string"
+    ? treePath.split(pathsep)
+    : !treePath
+    ? []
+    : treePath;
+}
+
 export async function safeStat(path: string): Promise<Deno.FileInfo | null> {
   // NOTE: Deno.stat() may be failed
   try {