Fix ext loadings

Author: Shougo

denops/ddc/ddc.ts

@@ -516,6 +516,19 @@ export class Ddc {
       this.currentUiParams = uiParams;
     }
 
+    if (!ui) {
+      console.log(`${options.ui} not found`);
+      return;
+    }
+
+    const input = denops.call("ddc#util#get_input", context.event);
+    const mode = fn.mode(denops);
+    if (context.input !== await input || context.mode !== await mode) {
+      // Input is changed.  Skip invalid completion.
+      await this.hide(denops, context, options);
+      return;
+    }
+
     await (async function write(ddc: Ddc) {
       await batch(denops, async (denops: Denops) => {
         await vars.g.set(denops, "ddc#_complete_pos", completePos);
@@ -529,14 +542,6 @@ export class Ddc {
         await ddc.show(denops, context, options, completePos, items);
       }
     })(this);
-
-    const input = denops.call("ddc#util#get_input", context.event);
-    const mode = fn.mode(denops);
-    if (context.input !== await input || context.mode !== await mode) {
-      // Input is changed.  Skip invalid completion.
-      await this.hide(denops, context, options);
-      return;
-    }
   }
 
   async show(

denops/ddc/ext.ts

@@ -46,22 +46,21 @@ export async function getUi(
   UiOptions,
   BaseParams,
 ]> {
-  if (options.ui.length === 0) {
+  const name = options.ui;
+
+  if (name.length === 0) {
     return [
       undefined,
       defaultUiOptions(),
       defaultDummy(),
     ];
   }
 
-  const ui = loader.getUi(options.ui);
-  if (!ui) {
-    if (!await loader.autoload(denops, "ui", options.ui)) {
-      await printError(
-        denops,
-        `Not found ui: "${options.ui}"`,
-      );
-    }
+  if (!loader.getUi(name) && !await loader.autoload(denops, "ui", name)) {
+    await printError(
+      denops,
+      `Not found ui: "${options.ui}"`,
+    );
 
     return [
       undefined,
@@ -70,6 +69,15 @@ export async function getUi(
     ];
   }
 
+  const ui = loader.getUi(name);
+  if (!ui) {
+    return [
+      undefined,
+      defaultUiOptions(),
+      defaultDummy(),
+    ];
+  }
+
   const [uiOptions, uiParams] = uiArgs(options, ui);
 
   await checkUiOnInit(ui, denops, uiOptions, uiParams);
@@ -90,14 +98,24 @@ export async function getSource(
   ]
 > {
   const name = source2Name(userSource);
+
+  if (
+    !loader.getSource(name) && !await loader.autoload(denops, "source", name)
+  ) {
+    await printError(
+      denops,
+      `Not found source: ${name}`,
+    );
+
+    return [
+      undefined,
+      defaultSourceOptions(),
+      defaultDummy(),
+    ];
+  }
+
   const source = loader.getSource(name);
   if (!source) {
-    if (!await loader.autoload(denops, "source", name)) {
-      await printError(
-        denops,
-        `Not found source: ${name}`,
-      );
-    }
     return [
       undefined,
       defaultSourceOptions(),
@@ -134,26 +152,30 @@ export async function getFilter(
   ]
 > {
   const name = filter2Name(userFilter);
-  const filter = loader.getFilter(name);
-  if (!filter) {
-    if (!await loader.autoload(denops, "filter", name)) {
-      await printError(
-        denops,
-        `Not found filter: ${name}`,
-      );
-    }
+
+  if (
+    !loader.getFilter(name) && !await loader.autoload(denops, "filter", name)
+  ) {
+    await printError(
+      denops,
+      `Not found filter: ${name}`,
+    );
+
     return [
       undefined,
       defaultFilterOptions(),
       defaultDummy(),
     ];
   }
 
+  const filter = loader.getFilter(name);
+
   const [filterOptions, filterParams] = filterArgs(
     filter,
     options,
     userFilter,
   );
+
   await checkFilterOnInit(filter, denops, filterOptions, filterParams);
 
   return [filter, filterOptions, filterParams];