Merge pull request #310 from vim-denops/add-internal-events

👍 Add `DenopsPluginWorkerPre` and `DenopsPluginWorkerPost`

Author: lambdalisue

autoload/denops/plugin.vim

@@ -141,14 +141,9 @@ function! s:find_plugin(plugin) abort
   throw printf('No denops plugin for "%s" exists', a:plugin)
 endfunction
 
-function! s:DenopsSystemPluginPre() abort
-  let l:plugin = matchstr(expand('<amatch>'), 'DenopsSystemPluginPre:\zs.*')
-  execute printf('doautocmd <nomodeline> User DenopsPluginPre:%s', l:plugin)
-endfunction
-
-function! s:DenopsSystemPluginPost() abort
-  let l:plugin = matchstr(expand('<amatch>'), 'DenopsSystemPluginPost:\zs.*')
-  execute printf('doautocmd <nomodeline> User DenopsPluginPost:%s', l:plugin)
+function! s:relay_autocmd(name) abort
+  let l:plugin = matchstr(expand('<amatch>'), '^[^:]\+:\zs.*')
+  execute printf('doautocmd <nomodeline> User %s:%s', a:name, l:plugin)
 endfunction
 
 function! s:DenopsSystemPluginFail() abort
@@ -172,8 +167,10 @@ endfunction
 
 augroup denops_autoload_plugin_internal
   autocmd!
-  autocmd User DenopsSystemPluginPre:* call s:DenopsSystemPluginPre()
-  autocmd User DenopsSystemPluginPost:* call s:DenopsSystemPluginPost()
+  autocmd User DenopsSystemPluginWorkerPre:* call s:relay_autocmd('DenopsPluginWorkerPre')
+  autocmd User DenopsSystemPluginWorkerPost:* call s:relay_autocmd('DenopsPluginWorkerPost')
+  autocmd User DenopsSystemPluginPre:* call s:relay_autocmd('DenopsPluginPre')
+  autocmd User DenopsSystemPluginPost:* call s:relay_autocmd('DenopsPluginPost')
   autocmd User DenopsSystemPluginFail:* call s:DenopsSystemPluginFail()
   autocmd User DenopsPluginPost:* ++nested call s:DenopsPluginPost()
   autocmd User DenopsClosed let s:loaded_plugins = {}

denops/@denops-private/host/invoker.ts

@@ -12,7 +12,9 @@ export class Invoker {
     name: string,
     script: string,
   ): void {
-    this.#service.load(name, script);
+    this.#service.load(name, script).catch((err) => {
+      console.error(`Failed to load plugin '${name}`, err);
+    });
   }
 
   reload(

denops/@denops-private/service.ts

@@ -36,25 +36,33 @@ export class Service implements Disposable {
     this.meta = meta;
   }
 
-  load(
+  async load(
     name: string,
     script: string,
     suffix = "",
-  ): void {
+  ): Promise<void> {
     const plugin = this.#plugins.get(name);
     if (plugin) {
       if (this.meta.mode === "debug") {
         console.log(`A denops plugin '${name}' is already loaded. Skip`);
       }
       return;
     }
+    await this.host.call(
+      "execute",
+      `doautocmd <nomodeline> User DenopsSystemPluginWorkerPre:${name}`,
+    );
     const worker = new Worker(
       new URL(workerScript, import.meta.url).href,
       {
         name,
         type: "module",
       },
     );
+    await this.host.call(
+      "execute",
+      `doautocmd <nomodeline> User DenopsSystemPluginWorkerPost:${name}`,
+    );
     const scriptUrl = resolveScriptUrl(script);
     worker.postMessage({
       scriptUrl: `${scriptUrl}${suffix}`,

denops/@denops-private/worker/script.ts

@@ -71,8 +71,8 @@ async function main(
     },
   });
   try {
-    const mod = await import(scriptUrl);
     await emit(denops, `DenopsSystemPluginPre:${worker.name}`);
+    const mod = await import(scriptUrl);
     await mod.main(denops);
     await emit(denops, `DenopsSystemPluginPost:${worker.name}`);
     await session.wait();

plugin/denops.vim

@@ -19,6 +19,8 @@ endif
 
 augroup denops_plugin_internal
   autocmd!
+  autocmd User DenopsPluginWorkerPre:* :
+  autocmd User DenopsPluginWorkerPost:* :
   autocmd User DenopsPluginPre:* :
   autocmd User DenopsPluginPost:* :
   autocmd User DenopsPluginFail:* :