Merge pull request #3 from vim-denops/context

Support context on execute and add Vim.get()

Author: lambdalisue

deps.ts

@@ -2,4 +2,4 @@ export type {
   Context,
   Dispatcher,
 } from "https://deno.land/x/[email protected]/mod.ts";
-export { Denops } from "https://deno.land/x/[email protected]/mod.ts";
+export { Denops, getCacheOrElse } from "https://deno.land/x/[email protected]/mod.ts";

mod.ts

@@ -1,4 +1 @@
-export * from "./autocmd.ts";
-export * from "./execute.ts";
-export * from "./variable.ts";
-export * from "./vim.ts";
+export { start, Vim } from "./vim/mod.ts";

autocmd.ts renamed to vim/autocmd.ts

@@ -1,4 +1,4 @@
-import { Denops } from "./deps.ts";
+import { Denops } from "../deps.ts";
 import { execute } from "./execute.ts";
 
 export async function autocmd(

execute.ts renamed to vim/execute.ts

@@ -1,20 +1,23 @@
-import { Denops } from "./deps.ts";
+import { Context, Denops } from "../deps.ts";
 
 /**
  * Execute Vim script directly
  */
 export async function execute(
   denops: Denops,
   command: string | string[],
+  context: Context = {},
 ): Promise<void> {
   if (Array.isArray(command)) {
-    await denops.cmd("call execute(l:command, '')", {
-      command: command
+    context = {
+      ...context,
+      __denops_internal_command: command
         .map((x) => x.replace(/^\s+|\s+$/g, ""))
         .filter((x) => !!x),
-    });
+    };
+    await denops.cmd("call execute(l:__denops_internal_command, '')", context);
     return;
   }
   command = command.replace(/\r?\n\s*\\/g, "");
-  await execute(denops, command.split(/\r?\n/g));
+  await execute(denops, command.split(/\r?\n/g), context);
 }

vim/mod.ts

@@ -0,0 +1,4 @@
+export * from "./autocmd.ts";
+export * from "./execute.ts";
+export * from "./variable.ts";
+export * from "./vim.ts";

variable.ts renamed to vim/variable.ts

@@ -1,4 +1,4 @@
-import { Denops } from "./deps.ts";
+import { Denops } from "../deps.ts";
 
 /**
  * Vim variable groups

vim.ts renamed to vim/vim.ts

@@ -1,4 +1,4 @@
-import { Context, Denops, Dispatcher } from "./deps.ts";
+import { Context, Denops, Dispatcher, getCacheOrElse } from "../deps.ts";
 import { execute } from "./execute.ts";
 import { autocmd, AutocmdHelper } from "./autocmd.ts";
 import { VariableHelper } from "./variable.ts";
@@ -23,6 +23,12 @@ export class Vim {
     this.env = new VariableHelper(denops, "env");
   }
 
+  static get(): Vim {
+    return getCacheOrElse("vim", () => {
+      return new Vim(Denops.get());
+    });
+  }
+
   get name(): string {
     return this.#denops.name;
   }
@@ -39,8 +45,11 @@ export class Vim {
     return await this.#denops.eval(expr, context);
   }
 
-  async execute(command: string | string[]): Promise<void> {
-    await execute(this.#denops, command);
+  async execute(
+    command: string | string[],
+    context: Context = {},
+  ): Promise<void> {
+    await execute(this.#denops, command, context);
   }
 
   async autocmd(
@@ -56,8 +65,5 @@ export class Vim {
 }
 
 export function start(main: (vim: Vim) => Promise<void>) {
-  Denops.start(async (denops) => {
-    const vim = new Vim(denops);
-    await main(vim);
-  });
+  Denops.start(() => main(Vim.get()));
 }