💥 Change behavior of default arguments of commands

Now default arguments are used only when no arguments are given and [&] (ampersand) feature is removed. We are planning to add a "persistent arguments" feature as an alternative.
lambdalisue · Sep 24, 2023 · 67021af · 67021af
1 parent a946599
commit 67021af
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 212 deletions.
diff --git a/denops/gin/command/branch/main.ts b/denops/gin/command/branch/main.ts
@@ -1,6 +1,10 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
-import { assert, is } from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
+import {
+  assert,
+  ensure,
+  is,
+} from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
 import * as vars from "https://deno.land/x/denops_std@v5.0.1/variable/mod.ts";
 import {
   builtinOpts,
@@ -10,11 +14,7 @@ import {
   validateOpts,
 } from "https://deno.land/x/denops_std@v5.0.1/argument/mod.ts";
 
-import {
-  normCmdArgs,
-  parseDisableDefaultArgs,
-  parseSilent,
-} from "../../util/cmd.ts";
+import { normCmdArgs, parseSilent } from "../../util/cmd.ts";
 import { exec } from "./command.ts";
 import { edit } from "./edit.ts";
 
@@ -26,14 +26,10 @@ export function main(denops: Denops): void {
       assert(mods, is.String, { name: "mods" });
       assert(args, is.ArrayOf(is.String), { name: "args" });
       const silent = parseSilent(mods);
-      const [disableDefaultArgs, realArgs] = parseDisableDefaultArgs(args);
       return helper.ensureSilent(denops, silent, () => {
         return helper.friendlyCall(
           denops,
-          () =>
-            command(denops, bang, mods, realArgs, {
-              disableDefaultArgs,
-            }),
+          () => command(denops, bang, mods, args),
         );
       });
     },
@@ -56,28 +52,22 @@ const allowedFlags = [
   "no-abbrev",
 ];
 
-type CommandOptions = {
-  disableDefaultArgs?: boolean;
-};
-
 async function command(
   denops: Denops,
   bang: string,
   mods: string,
   args: string[],
-  options: CommandOptions = {},
 ): Promise<void> {
-  if (!options.disableDefaultArgs) {
-    const defaultArgs = await vars.g.get(
-      denops,
-      "gin_branch_default_args",
-      [],
+  if (args.length === 0) {
+    args = ensure(
+      await vars.g.get(denops, "gin_branch_default_args", []),
+      is.ArrayOf(is.String),
+      {
+        name: "g:gin_branch_default_args",
+      },
     );
-    assert(defaultArgs, is.ArrayOf(is.String), {
-      name: "g:gin_branch_default_args",
-    });
-    args = [...defaultArgs, ...args];
   }
+
   const [opts, flags, residue] = parse(await normCmdArgs(denops, args));
   validateOpts(opts, [
     "worktree",

diff --git a/denops/gin/command/browse/main.ts b/denops/gin/command/browse/main.ts
@@ -14,7 +14,7 @@ import {
   validateFlags,
   validateOpts,
 } from "https://deno.land/x/denops_std@v5.0.1/argument/mod.ts";
-import { normCmdArgs, parseDisableDefaultArgs } from "../../util/cmd.ts";
+import { normCmdArgs } from "../../util/cmd.ts";
 import { exec } from "./command.ts";
 
 type Range = readonly [number, number];
@@ -27,12 +27,10 @@ export function main(denops: Denops): void {
     "browse:command": (args, range) => {
       assert(args, is.ArrayOf(is.String), { name: "args" });
       assert(range, is.OneOf([is.Undefined, isRange]), { name: "range" });
-      const [disableDefaultArgs, realArgs] = parseDisableDefaultArgs(args);
       return helper.friendlyCall(
         denops,
         () =>
-          command(denops, realArgs, {
-            disableDefaultArgs,
+          command(denops, args, {
             range,
           }),
       );
@@ -41,7 +39,6 @@ export function main(denops: Denops): void {
 }
 
 type CommandOptions = {
-  disableDefaultArgs?: boolean;
   range?: Range;
 };
 
@@ -50,17 +47,16 @@ async function command(
   args: string[],
   options: CommandOptions = {},
 ): Promise<void> {
-  if (!options.disableDefaultArgs) {
-    const defaultArgs = await vars.g.get(
-      denops,
-      "gin_browse_default_args",
-      [],
+  if (args.length === 0) {
+    args = ensure(
+      await vars.g.get(denops, "gin_browse_default_args", []),
+      is.ArrayOf(is.String),
+      {
+        name: "g:gin_browse_default_args",
+      },
     );
-    assert(defaultArgs, is.ArrayOf(is.String), {
-      name: "g:gin_browse_default_args",
-    });
-    args = [...defaultArgs, ...args];
   }
+
   const [opts, flags, residue] = parse(await normCmdArgs(denops, args));
   validateFlags(flags, [
     "remote",

diff --git a/denops/gin/command/chaperon/main.ts b/denops/gin/command/chaperon/main.ts
@@ -1,18 +1,18 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
 import * as vars from "https://deno.land/x/denops_std@v5.0.1/variable/mod.ts";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
-import { assert, is } from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
+import {
+  assert,
+  ensure,
+  is,
+} from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
 import {
   builtinOpts,
   formatOpts,
   parse,
   validateOpts,
 } from "https://deno.land/x/denops_std@v5.0.1/argument/mod.ts";
-import {
-  normCmdArgs,
-  parseDisableDefaultArgs,
-  parseSilent,
-} from "../../util/cmd.ts";
+import { normCmdArgs, parseSilent } from "../../util/cmd.ts";
 import { exec } from "./command.ts";
 
 export function main(denops: Denops): void {
@@ -22,43 +22,33 @@ export function main(denops: Denops): void {
       assert(bang, is.String, { name: "bang" });
       assert(mods, is.String, { name: "mods" });
       assert(args, is.ArrayOf(is.String), { name: "args" });
-      const [disableDefaultArgs, realArgs] = parseDisableDefaultArgs(args);
       const silent = parseSilent(mods);
       return helper.ensureSilent(denops, silent, () => {
         return helper.friendlyCall(
           denops,
-          () =>
-            command(denops, bang, mods, realArgs, {
-              disableDefaultArgs,
-            }),
+          () => command(denops, bang, mods, args),
         );
       });
     },
   };
 }
 
-type CommandOptions = {
-  disableDefaultArgs?: boolean;
-};
-
 async function command(
   denops: Denops,
   bang: string,
   mods: string,
   args: string[],
-  options: CommandOptions = {},
 ): Promise<void> {
-  if (!options.disableDefaultArgs) {
-    const defaultArgs = await vars.g.get(
-      denops,
-      "gin_chaperon_default_args",
-      [],
+  if (args.length === 0) {
+    args = ensure(
+      await vars.g.get(denops, "gin_chaperon_default_args", []),
+      is.ArrayOf(is.String),
+      {
+        name: "g:gin_chaperon_default_args",
+      },
     );
-    assert(defaultArgs, is.ArrayOf(is.String), {
-      name: "g:gin_chaperon_default_args",
-    });
-    args = [...defaultArgs, ...args];
   }
+
   const [opts, _, residue] = parse(await normCmdArgs(denops, args));
   validateOpts(opts, [
     "worktree",

diff --git a/denops/gin/command/diff/main.ts b/denops/gin/command/diff/main.ts
@@ -1,5 +1,9 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
-import { assert, is } from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
+import {
+  assert,
+  ensure,
+  is,
+} from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
 import * as vars from "https://deno.land/x/denops_std@v5.0.1/variable/mod.ts";
 import {
@@ -9,11 +13,7 @@ import {
   validateFlags,
   validateOpts,
 } from "https://deno.land/x/denops_std@v5.0.1/argument/mod.ts";
-import {
-  normCmdArgs,
-  parseDisableDefaultArgs,
-  parseSilent,
-} from "../../util/cmd.ts";
+import { normCmdArgs, parseSilent } from "../../util/cmd.ts";
 import { exec } from "./command.ts";
 import { edit } from "./edit.ts";
 import { read } from "./read.ts";
@@ -26,15 +26,11 @@ export function main(denops: Denops): void {
       assert(bang, is.String, { name: "bang" });
       assert(mods, is.String, { name: "mods" });
       assert(args, is.ArrayOf(is.String), { name: "args" });
-      const [disableDefaultArgs, realArgs] = parseDisableDefaultArgs(args);
       const silent = parseSilent(mods);
       return helper.ensureSilent(denops, silent, () => {
         return helper.friendlyCall(
           denops,
-          () =>
-            command(denops, bang, mods, realArgs, {
-              disableDefaultArgs,
-            }),
+          () => command(denops, bang, mods, args),
         );
       });
     },
@@ -81,28 +77,22 @@ const allowedFlags = [
   "ignore-submodules",
 ];
 
-type CommandOptions = {
-  disableDefaultArgs?: boolean;
-};
-
 async function command(
   denops: Denops,
   bang: string,
   mods: string,
   args: string[],
-  options: CommandOptions = {},
 ): Promise<void> {
-  if (!options.disableDefaultArgs) {
-    const defaultArgs = await vars.g.get(
-      denops,
-      "gin_diff_default_args",
-      [],
+  if (args.length === 0) {
+    args = ensure(
+      await vars.g.get(denops, "gin_diff_default_args", []),
+      is.ArrayOf(is.String),
+      {
+        name: "g:gin_diff_default_args",
+      },
     );
-    assert(defaultArgs, is.ArrayOf(is.String), {
-      name: "g:gin_diff_default_args",
-    });
-    args = [...defaultArgs, ...args];
   }
+
   const [opts, flags, residue] = parse(await normCmdArgs(denops, args));
   validateOpts(opts, [
     "processor",

diff --git a/denops/gin/command/edit/main.ts b/denops/gin/command/edit/main.ts
@@ -1,5 +1,9 @@
 import type { Denops } from "https://deno.land/x/denops_std@v5.0.1/mod.ts";
-import { assert, is } from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
+import {
+  assert,
+  ensure,
+  is,
+} from "https://deno.land/x/unknownutil@v3.9.0/mod.ts#^";
 import * as vars from "https://deno.land/x/denops_std@v5.0.1/variable/mod.ts";
 import * as helper from "https://deno.land/x/denops_std@v5.0.1/helper/mod.ts";
 import {
@@ -8,11 +12,7 @@ import {
   parseOpts,
   validateOpts,
 } from "https://deno.land/x/denops_std@v5.0.1/argument/mod.ts";
-import {
-  normCmdArgs,
-  parseDisableDefaultArgs,
-  parseSilent,
-} from "../../util/cmd.ts";
+import { normCmdArgs, parseSilent } from "../../util/cmd.ts";
 import { exec } from "./command.ts";
 import { edit } from "./edit.ts";
 import { read } from "./read.ts";
@@ -25,15 +25,11 @@ export function main(denops: Denops): void {
       assert(bang, is.String, { name: "bang" });
       assert(mods, is.String, { name: "mods" });
       assert(args, is.ArrayOf(is.String), { name: "args" });
-      const [disableDefaultArgs, realArgs] = parseDisableDefaultArgs(args);
       const silent = parseSilent(mods);
       return helper.ensureSilent(denops, silent, () => {
         return helper.friendlyCall(
           denops,
-          () =>
-            command(denops, bang, mods, realArgs, {
-              disableDefaultArgs,
-            }),
+          () => command(denops, bang, mods, args),
         );
       });
     },
@@ -55,28 +51,22 @@ export function main(denops: Denops): void {
   };
 }
 
-type CommandOptions = {
-  disableDefaultArgs?: boolean;
-};
-
 async function command(
   denops: Denops,
   bang: string,
   mods: string,
   args: string[],
-  options: CommandOptions = {},
 ): Promise<void> {
-  if (!options.disableDefaultArgs) {
-    const defaultArgs = await vars.g.get(
-      denops,
-      "gin_edit_default_args",
-      [],
+  if (args.length === 0) {
+    args = ensure(
+      await vars.g.get(denops, "gin_edit_default_args", []),
+      is.ArrayOf(is.String),
+      {
+        name: "g:gin_edit_default_args",
+      },
     );
-    assert(defaultArgs, is.ArrayOf(is.String), {
-      name: "g:gin_edit_default_args",
-    });
-    args = [...defaultArgs, ...args];
   }
+
   const [opts, residue] = parseOpts(await normCmdArgs(denops, args));
   validateOpts(opts, [
     "worktree",