👍 Use dispatch to execute command in actions

To support persistent arguments in actions as well.

denops/gin/action/add.ts

@@ -1,7 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate = { path: string };
 
@@ -36,12 +35,12 @@ async function doAdd(
   gatherCandidates: GatherCandidates<Candidate>,
 ): Promise<void> {
   const xs = await gatherCandidates(denops, bufnr, range);
-  await execBare(denops, [
+  await denops.dispatch("gin", "command", "silent", [
     "add",
     "--ignore-errors",
     "--force",
     ...extraArgs,
     "--",
     ...xs.map((x) => x.path),
-  ], { stdoutIndicator: "null" });
+  ]);
 }

denops/gin/action/branch_delete.ts

@@ -1,7 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate =
   | { kind: "remote"; branch: string; remote: string }
@@ -43,15 +42,15 @@ async function doDelete(
       case "alias":
         continue;
       case "remote":
-        await execBare(denops, [
+        await denops.dispatch("gin", "command", "", [
           "push",
           "--delete",
           x.remote,
           x.branch,
         ]);
         break;
       default:
-        await execBare(denops, [
+        await denops.dispatch("gin", "command", "", [
           "branch",
           force ? "-D" : "-d",
           x.branch,

denops/gin/action/branch_move.ts

@@ -2,7 +2,6 @@ import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
 import { define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate = { branch: string };
 
@@ -51,7 +50,7 @@ async function doMove(
     await helper.echoerr(denops, "Cancelled");
     return;
   }
-  await execBare(denops, [
+  await denops.dispatch("gin", "command", "", [
     "branch",
     ...(force ? ["--force"] : []),
     "--move",

denops/gin/action/branch_new.ts

@@ -2,7 +2,6 @@ import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
 import { define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate = { target?: string };
 
@@ -54,7 +53,7 @@ async function doNew(
     await helper.echoerr(denops, "Cancelled");
     return;
   }
-  await execBare(denops, [
+  await denops.dispatch("gin", "command", "", [
     "switch",
     force ? "-C" : "-c",
     name,
@@ -76,5 +75,5 @@ async function doNewOrphan(
     await helper.echoerr(denops, "Cancelled");
     return;
   }
-  await execBare(denops, ["switch", "--orphan", name]);
+  await denops.dispatch("gin", "command", "", ["switch", "--orphan", name]);
 }

denops/gin/action/chaperon.ts

@@ -1,10 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import {
-  exec as execChaperon,
-  ExecOptions as ExecChaperonOptions,
-} from "../command/chaperon/command.ts";
 
 export type Candidate = { path: string };
 
@@ -19,21 +15,21 @@ export async function init(
       bufnr,
       "chaperon:both",
       (denops, bufnr, range) =>
-        doChaperon(denops, bufnr, range, {}, gatherCandidates),
+        doChaperon(denops, bufnr, range, [], gatherCandidates),
     );
     await define(
       denops,
       bufnr,
       "chaperon:theirs",
       (denops, bufnr, range) =>
-        doChaperon(denops, bufnr, range, { noOurs: true }, gatherCandidates),
+        doChaperon(denops, bufnr, range, ["++no-ours"], gatherCandidates),
     );
     await define(
       denops,
       bufnr,
       "chaperon:ours",
       (denops, bufnr, range) =>
-        doChaperon(denops, bufnr, range, { noTheirs: true }, gatherCandidates),
+        doChaperon(denops, bufnr, range, ["++no-theirs"], gatherCandidates),
     );
     await alias(
       denops,
@@ -48,14 +44,15 @@ async function doChaperon(
   denops: Denops,
   bufnr: number,
   range: Range,
-  options: ExecChaperonOptions,
+  extraArgs: string[],
   gatherCandidates: GatherCandidates<Candidate>,
 ): Promise<void> {
   const xs = await gatherCandidates(denops, bufnr, range);
   for (const x of xs) {
-    await execChaperon(denops, x.path, {
-      opener: "tabedit",
-      ...options,
-    });
+    await denops.dispatch("gin", "chaperon:command", "", "", [
+      "++opener=tabedit",
+      ...extraArgs,
+      x.path,
+    ]);
   }
 }

denops/gin/action/cherry_pick.ts

@@ -1,7 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate = { commit: string };
 
@@ -47,7 +46,7 @@ async function doCherryPick(
   if (!x) {
     return;
   }
-  await execBare(denops, [
+  await denops.dispatch("gin", "command", "", [
     "cherry-pick",
     ...(mainline ? [] : ["--mainline", mainline]),
     x.commit,

denops/gin/action/diff.ts

@@ -1,10 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import {
-  exec as execDiff,
-  ExecOptions as ExecDiffOptions,
-} from "../command/diff/command.ts";
 
 export type Candidate = { path: string };
 
@@ -26,7 +22,7 @@ export async function init(
         bufnr,
         `diff:local:${opener}`,
         (denops, bufnr, range) =>
-          doDiff(denops, bufnr, range, opener, {}, gatherCandidates),
+          doDiff(denops, bufnr, range, opener, [], gatherCandidates),
       );
       await define(
         denops,
@@ -38,7 +34,7 @@ export async function init(
             bufnr,
             range,
             opener,
-            { flags: { "cached": "" } },
+            ["--cached"],
             gatherCandidates,
           ),
       );
@@ -52,7 +48,7 @@ export async function init(
             bufnr,
             range,
             opener,
-            { commitish: "HEAD" },
+            ["HEAD"],
             gatherCandidates,
           ),
       );
@@ -89,15 +85,16 @@ async function doDiff(
   bufnr: number,
   range: Range,
   opener: string,
-  options: ExecDiffOptions,
+  extraArgs: string[],
   gatherCandidates: GatherCandidates<Candidate>,
 ): Promise<void> {
   const xs = await gatherCandidates(denops, bufnr, range);
   for (const x of xs) {
-    await execDiff(denops, {
-      opener,
-      paths: [x.path],
-      ...options,
-    });
+    await denops.dispatch("gin", "diff:command", "", "", [
+      `++opener=${opener}`,
+      ...extraArgs,
+      "--",
+      x.path,
+    ]);
   }
 }

denops/gin/action/diff_smart.ts

@@ -1,7 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import { exec as execDiff } from "../command/diff/command.ts";
 
 export type Candidate = { path: string; XY: string };
 
@@ -51,18 +50,18 @@ async function doDiffSmart(
   const xs = await gatherCandidates(denops, bufnr, range);
   for (const x of xs) {
     if (x.XY.startsWith(".")) {
-      await execDiff(denops, {
-        opener,
-        paths: [x.path],
-      });
+      await denops.dispatch("gin", "diff:command", "", "", [
+        `++opener=${opener}`,
+        "--",
+        x.path,
+      ]);
     } else {
-      await execDiff(denops, {
-        opener,
-        paths: [x.path],
-        flags: {
-          "cached": "",
-        },
-      });
+      await denops.dispatch("gin", "diff:command", "", "", [
+        `++opener=${opener}`,
+        "--cached",
+        "--",
+        x.path,
+      ]);
     }
   }
 }

denops/gin/action/edit.ts

@@ -2,10 +2,6 @@ import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import * as buffer from "https://deno.land/x/denops_std@v5.0.1/buffer/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import {
-  exec as execEdit,
-  ExecOptions as ExecEditOptions,
-} from "../command/edit/command.ts";
 
 export type Candidate = { path: string };
 
@@ -34,7 +30,7 @@ export async function init(
         bufnr,
         `edit:cached:${opener}`,
         (denops, bufnr, range) =>
-          doEdit(denops, bufnr, range, opener, {}, gatherCandidates),
+          doEdit(denops, bufnr, range, opener, [], gatherCandidates),
       );
       await define(
         denops,
@@ -46,7 +42,7 @@ export async function init(
             bufnr,
             range,
             opener,
-            { commitish: "HEAD" },
+            ["HEAD"],
             gatherCandidates,
           ),
       );
@@ -83,15 +79,16 @@ async function doEdit(
   bufnr: number,
   range: Range,
   opener: string,
-  options: ExecEditOptions,
+  extraArgs: string[],
   gatherCandidates: GatherCandidates<Candidate>,
 ): Promise<void> {
   const xs = await gatherCandidates(denops, bufnr, range);
   for (const x of xs) {
-    await execEdit(denops, x.path, {
-      opener,
-      ...options,
-    });
+    await denops.dispatch("gin", "edit:command", "", "", [
+      `++opener=${opener}`,
+      ...extraArgs,
+      x.path,
+    ]);
   }
 }
 

denops/gin/action/merge.ts

@@ -1,7 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import { exec as execBare } from "../command/bare/command.ts";
 
 export type Candidate = { commit: string };
 
@@ -53,7 +52,7 @@ async function doMerge(
   if (!x) {
     return;
   }
-  await execBare(denops, [
+  await denops.dispatch("gin", "command", "", [
     "merge",
     `--${method}`,
     x.commit,

denops/gin/action/patch.ts

@@ -1,10 +1,6 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as batch from "https://deno.land/x/denops_std@v5.0.1/batch/mod.ts";
 import { alias, define, GatherCandidates, Range } from "./core.ts";
-import {
-  exec as execPatch,
-  ExecOptions as ExecPatchOptions,
-} from "../command/patch/command.ts";
 
 export type Candidate = { path: string };
 
@@ -19,21 +15,21 @@ export async function init(
       bufnr,
       "patch:both",
       (denops, bufnr, range) =>
-        doPatch(denops, bufnr, range, {}, gatherCandidates),
+        doPatch(denops, bufnr, range, [], gatherCandidates),
     );
     await define(
       denops,
       bufnr,
       "patch:head",
       (denops, bufnr, range) =>
-        doPatch(denops, bufnr, range, { noWorktree: true }, gatherCandidates),
+        doPatch(denops, bufnr, range, ["++no-worktree"], gatherCandidates),
     );
     await define(
       denops,
       bufnr,
       "patch:worktree",
       (denops, bufnr, range) =>
-        doPatch(denops, bufnr, range, { noHead: true }, gatherCandidates),
+        doPatch(denops, bufnr, range, ["++no-head"], gatherCandidates),
     );
     await alias(
       denops,
@@ -48,14 +44,15 @@ async function doPatch(
   denops: Denops,
   bufnr: number,
   range: Range,
-  options: ExecPatchOptions,
+  extraArgs: string[],
   gatherCandidates: GatherCandidates<Candidate>,
 ): Promise<void> {
   const xs = await gatherCandidates(denops, bufnr, range);
   for (const x of xs) {
-    await execPatch(denops, x.path, {
-      opener: "tabedit",
-      ...options,
-    });
+    await denops.dispatch("gin", "patch:command", "", "", [
+      `++opener=tabedit`,
+      ...extraArgs,
+      x.path,
+    ]);
   }
 }