Merge pull request #52 from lambdalisue/ref

Feature updates

Author: lambdalisue

autoload/gin/action.vim

@@ -1,8 +1,9 @@
 let s:range_from_call = v:null
 
 function! gin#action#fn(callback) abort
+  let bufnr = bufnr()
   let range = gin#action#_get_range()
-  let xs = gin#action#gather_candidates(range)
+  let xs = gin#action#gather_candidates(bufnr, range)
   call call(a:callback, [xs])
 endfunction
 
@@ -16,12 +17,12 @@ function! gin#action#call(name, range) abort
   endtry
 endfunction
 
-function! gin#action#list_actions() abort
-  return denops#request('gin', 'action:list_actions', [])
+function! gin#action#list_actions(bufnr) abort
+  return denops#request('gin', 'action:list_actions', [a:bufnr])
 endfunction
 
-function! gin#action#gather_candidates(range) abort
-  return denops#request('gin', 'action:gather_candidates', [a:range])
+function! gin#action#gather_candidates(bufnr, range) abort
+  return denops#request('gin', 'action:gather_candidates', [a:bufnr, a:range])
 endfunction
 
 function! gin#action#_get_range() abort

denops/gin/component/branch.ts

@@ -1,7 +1,10 @@
-import type { Denops } from "https://deno.land/x/denops_std@v3.3.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_std@v3.6.0/mod.ts";
 import { Cache } from "https://deno.land/x/[email protected]/mod.ts";
 import { decodeUtf8 } from "../util/text.ts";
-import { getWorktree } from "../util/worktree.ts";
+import {
+  findWorktreeFromSuspects,
+  listWorktreeSuspectsFromDenops,
+} from "../util/worktree.ts";
 import { execute } from "../git/process.ts";
 
 type Data = [string, string];
@@ -14,8 +17,10 @@ async function getData(
   if (cache.has("data")) {
     return cache.get("data");
   }
-  const cwd = await getWorktree(denops);
-  const result = await getBranches(cwd);
+  const worktree = await findWorktreeFromSuspects(
+    await listWorktreeSuspectsFromDenops(denops),
+  );
+  const result = await getBranches(worktree);
   cache.set("data", result);
   return result;
 }

denops/gin/component/traffic.ts

@@ -1,7 +1,10 @@
-import type { Denops } from "https://deno.land/x/denops_std@v3.3.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_std@v3.6.0/mod.ts";
 import { Cache } from "https://deno.land/x/[email protected]/mod.ts";
 import { decodeUtf8 } from "../util/text.ts";
-import { getWorktree } from "../util/worktree.ts";
+import {
+  findWorktreeFromSuspects,
+  listWorktreeSuspectsFromDenops,
+} from "../util/worktree.ts";
 import { execute } from "../git/process.ts";
 
 type Data = [number, number];
@@ -14,10 +17,12 @@ async function getData(
   if (cache.has("data")) {
     return cache.get("data");
   }
-  const cwd = await getWorktree(denops);
+  const worktree = await findWorktreeFromSuspects(
+    await listWorktreeSuspectsFromDenops(denops),
+  );
   const result = await Promise.all([
-    getAhead(cwd),
-    getBehind(cwd),
+    getAhead(worktree),
+    getBehind(worktree),
   ]);
   cache.set("data", result);
   return result;

denops/gin/component/worktree.ts

@@ -1,7 +1,10 @@
-import type { Denops } from "https://deno.land/x/denops_std@v3.3.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_std@v3.6.0/mod.ts";
 import { Cache } from "https://deno.land/x/[email protected]/mod.ts";
-import * as path from "https://deno.land/[email protected]/path/mod.ts";
-import { getWorktree } from "../util/worktree.ts";
+import * as path from "https://deno.land/[email protected]/path/mod.ts";
+import {
+  findWorktreeFromSuspects,
+  listWorktreeSuspectsFromDenops,
+} from "../util/worktree.ts";
 import { find } from "../git/finder.ts";
 
 type Data = string;
@@ -14,8 +17,10 @@ async function getData(
   if (cache.has("data")) {
     return cache.get("data");
   }
-  const cwd = await getWorktree(denops);
-  const result = await find(cwd);
+  const worktree = await findWorktreeFromSuspects(
+    await listWorktreeSuspectsFromDenops(denops),
+  );
+  const result = await find(worktree);
   cache.set("data", result);
   return result;
 }

denops/gin/core/action/action.ts

@@ -1,7 +1,9 @@
-import type { Denops } from "https://deno.land/x/[email protected]/mod.ts";
-import * as helper from "https://deno.land/x/[email protected]/helper/mod.ts";
-import * as mapping from "https://deno.land/x/[email protected]/mapping/mod.ts";
-import * as vars from "https://deno.land/x/[email protected]/variable/mod.ts";
+import type { Denops } from "https://deno.land/x/[email protected]/mod.ts";
+import * as buffer from "https://deno.land/x/[email protected]/buffer/mod.ts";
+import * as fn from "https://deno.land/x/[email protected]/function/mod.ts";
+import * as helper from "https://deno.land/x/[email protected]/helper/mod.ts";
+import * as mapping from "https://deno.land/x/[email protected]/mapping/mod.ts";
+import * as vars from "https://deno.land/x/[email protected]/variable/mod.ts";
 
 export type Action = {
   name: string;
@@ -11,18 +13,24 @@ export type Action = {
 
 export type Range = [number, number];
 
-export async function list(denops: Denops): Promise<Action[]> {
-  const ms = await mapping.list(denops, "<Plug>(gin-action-", { mode: "n" });
-  const cs = ms.flatMap((map) => {
-    const m = map.lhs.match(/^<Plug>\(gin-action-(.*)\)$/);
-    if (!m) {
-      return [];
-    }
-    return [{
-      lhs: map.lhs,
-      rhs: map.rhs,
-      name: m[1],
-    }];
+export async function list(
+  denops: Denops,
+  bufnr: number,
+): Promise<Action[]> {
+  let cs: Action[] = [];
+  await buffer.ensure(denops, bufnr, async () => {
+    const ms = await mapping.list(denops, "<Plug>(gin-action-", { mode: "n" });
+    cs = ms.flatMap((map) => {
+      const m = map.lhs.match(/^<Plug>\(gin-action-(.*)\)$/);
+      if (!m) {
+        return [];
+      }
+      return [{
+        lhs: map.lhs,
+        rhs: map.rhs,
+        name: m[1],
+      }];
+    });
   });
   return cs;
 }
@@ -31,7 +39,7 @@ export async function actionChoice(
   denops: Denops,
   range: Range,
 ): Promise<void> {
-  const cs = await list(denops);
+  const cs = await list(denops, await fn.bufnr(denops));
   const name = await helper.input(denops, {
     prompt: "action: ",
     completion: (

denops/gin/core/action/main.ts

@@ -1,4 +1,4 @@
-import type { Denops } from "https://deno.land/x/denops_std@v3.3.0/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_std@v3.6.0/mod.ts";
 import * as unknownutil from "https://deno.land/x/[email protected]/mod.ts";
 import * as registry from "./registry.ts";
 import * as action from "./action.ts";
@@ -8,12 +8,14 @@ const rangeRef: [number, number] = [0, 0];
 export function main(denops: Denops): void {
   denops.dispatcher = {
     ...denops.dispatcher,
-    "action:list_actions": () => {
-      return action.list(denops);
+    "action:list_actions": (bufnr) => {
+      unknownutil.assertNumber(bufnr);
+      return action.list(denops, bufnr);
     },
-    "action:gather_candidates": (range) => {
+    "action:gather_candidates": (bufnr, range) => {
+      unknownutil.assertNumber(bufnr);
       unknownutil.assertLike(rangeRef, range);
-      return registry.gatherCandidates(denops, range);
+      return registry.gatherCandidates(denops, bufnr, range);
     },
     "action:action:choice": (range) => {
       unknownutil.assertLike(rangeRef, range);

denops/gin/core/action/registry.ts

@@ -1,7 +1,6 @@
-import type { Denops } from "https://deno.land/x/[email protected]/mod.ts";
-import * as anonymous from "https://deno.land/x/[email protected]/anonymous/mod.ts";
-import * as autocmd from "https://deno.land/x/[email protected]/autocmd/mod.ts";
-import * as fn from "https://deno.land/x/[email protected]/function/mod.ts";
+import type { Denops } from "https://deno.land/x/[email protected]/mod.ts";
+import * as anonymous from "https://deno.land/x/[email protected]/anonymous/mod.ts";
+import * as autocmd from "https://deno.land/x/[email protected]/autocmd/mod.ts";
 import type { Range } from "./action.ts";
 
 export type { Range };
@@ -13,14 +12,15 @@ export type Candidate = {
 
 export type Gatherer = (
   denops: Denops,
+  bufnr: number,
   range: Range,
 ) => Promise<Candidate[]>;
 
 export async function register(
   denops: Denops,
+  bufnr: number,
   gatherer: Gatherer,
 ): Promise<void> {
-  const bufnr = await fn.bufnr(denops);
   const pat = `<buffer=${bufnr}>`;
   const [id] = anonymous.once(denops, () => {
     registry.delete(bufnr);
@@ -45,14 +45,14 @@ export async function register(
 
 export async function gatherCandidates(
   denops: Denops,
+  bufnr: number,
   range: Range,
 ): Promise<Candidate[]> {
-  const bufnr = await fn.bufnr(denops);
   const gatherer = registry.get(bufnr);
   if (!gatherer) {
     throw new Error(`No gatherer is registered on a buffer ${bufnr}`);
   }
-  return await gatherer(denops, range);
+  return await gatherer(denops, bufnr, range);
 }
 
 // Global registry

denops/gin/core/bare/command.ts

@@ -1,53 +1,88 @@
-import type { Denops } from "https://deno.land/x/denops_std@v3.3.0/mod.ts";
-import * as autocmd from "https://deno.land/x/denops_std@v3.3.0/autocmd/mod.ts";
-import * as batch from "https://deno.land/x/denops_std@v3.3.0/batch/mod.ts";
-import * as fn from "https://deno.land/x/denops_std@v3.3.0/function/mod.ts";
-import * as helper from "https://deno.land/x/denops_std@v3.3.0/helper/mod.ts";
-import * as option from "https://deno.land/x/denops_std@v3.3.0/option/mod.ts";
+import type { Denops } from "https://deno.land/x/denops_std@v3.6.0/mod.ts";
+import * as autocmd from "https://deno.land/x/denops_std@v3.6.0/autocmd/mod.ts";
+import * as batch from "https://deno.land/x/denops_std@v3.6.0/batch/mod.ts";
+import * as fn from "https://deno.land/x/denops_std@v3.6.0/function/mod.ts";
+import * as helper from "https://deno.land/x/denops_std@v3.6.0/helper/mod.ts";
+import * as option from "https://deno.land/x/denops_std@v3.6.0/option/mod.ts";
 import * as unknownutil from "https://deno.land/x/[email protected]/mod.ts";
 import {
-  builtinOpts,
   parseOpts,
   validateOpts,
-} from "https://deno.land/x/denops_std@v3.3.0/argument/mod.ts";
-import { normCmdArgs } from "../../util/cmd.ts";
-import * as buffer from "https://deno.land/x/denops_std@v3.3.0/buffer/mod.ts";
+} from "https://deno.land/x/denops_std@v3.6.0/argument/mod.ts";
+import { expand, normCmdArgs } from "../../util/cmd.ts";
+import * as buffer from "https://deno.land/x/denops_std@v3.6.0/buffer/mod.ts";
 import {
   buildDecorationsFromAnsiEscapeCode,
   removeAnsiEscapeCode,
 } from "../../util/ansi_escape_code.ts";
-import { getWorktreeFromOpts } from "../../util/worktree.ts";
+import {
+  findWorktreeFromSuspects,
+  listWorktreeSuspectsFromDenops,
+} from "../../util/worktree.ts";
 import { decodeUtf8 } from "../../util/text.ts";
 import { run } from "../../git/process.ts";
 
+export type Options = {
+  worktree?: string;
+  buffer?: boolean | string;
+  monochrome?: boolean;
+  fileformat?: string;
+  encoding?: string;
+};
+
 export async function command(
   denops: Denops,
   args: string[],
 ): Promise<void> {
-  const [env, verbose, eventignore] = await batch.gather(
+  const [opts, residue] = parseOpts(await normCmdArgs(denops, args));
+  validateOpts(opts, [
+    "worktree",
+    "buffer",
+    "monochrome",
+    "ff",
+    "fileformat",
+    "enc",
+    "encoding",
+  ]);
+  const buffer = opts["buffer"] === "" ? true : opts["buffer"];
+  const options = {
+    worktree: opts["worktree"],
+    buffer,
+    monochrome: "monochrome" in opts,
+    fileformat: opts["ff"] ?? opts["fileformat"],
+    encoding: opts["enc"] ?? opts["encoding"],
+  };
+  await exec(denops, residue, options);
+}
+
+export async function exec(
+  denops: Denops,
+  args: string[],
+  options: Options = {},
+): Promise<void> {
+  const [verbose, env, eventignore] = await batch.gather(
     denops,
     async (denops) => {
-      await fn.environ(denops);
       await option.verbose.get(denops);
+      await fn.environ(denops);
       await option.eventignore.get(denops);
     },
   );
-  unknownutil.assertObject(env, unknownutil.isString);
   unknownutil.assertNumber(verbose);
+  unknownutil.assertObject(env, unknownutil.isString);
   unknownutil.assertString(eventignore);
-  const [opts, residue] = parseOpts(await normCmdArgs(denops, args));
-  validateOpts(opts, [
-    "worktree",
-    "buffer",
-    "monochrome",
-    ...builtinOpts,
-  ]);
-  const enableColor = "buffer" in opts && !("monochrome" in opts);
+
+  const enableColor = options.buffer && !options.monochrome;
   const cmd = [
     ...(enableColor ? ["-c", "color.ui=always"] : []),
-    ...residue,
+    ...args,
   ];
-  const worktree = await getWorktreeFromOpts(denops, opts);
+  const worktree = await findWorktreeFromSuspects(
+    options.worktree
+      ? [await expand(denops, options.worktree)]
+      : await listWorktreeSuspectsFromDenops(denops, !!verbose),
+    !!verbose,
+  );
   const proc = run(cmd, {
     printCommand: !!verbose,
     stdin: "null",
@@ -63,27 +98,34 @@ export async function command(
     proc.stderrOutput(),
   ]);
   proc.close();
-  if ("buffer" in opts) {
+  if (options.buffer) {
     let decorations: buffer.Decoration[] = [];
     const preprocessor = (content: string[]) => {
       const [trimmed, decos] = buildDecorationsFromAnsiEscapeCode(content);
       decorations = decos;
       return trimmed;
     };
-    await denops.cmd("noswapfile enew");
-    const bufnr = await fn.bufnr(denops);
-    await buffer.ensure(denops, bufnr, async () => {
-      await batch.batch(denops, async (denops) => {
-        await option.modifiable.setLocal(denops, false);
-      });
+    let bufnr: number;
+    if (typeof options.buffer === "string") {
+      bufnr = await fn.bufnr(denops, options.buffer);
+      if (bufnr === -1) {
+        bufnr = await fn.bufnr(denops, Number(options.buffer));
+      }
+      await fn.bufload(denops, bufnr);
+    } else {
+      await denops.cmd("noswapfile enew");
+      bufnr = await fn.bufnr(denops);
+    }
+    await batch.batch(denops, async (denops) => {
+      await fn.setbufvar(denops, bufnr, "&modifiable", 0);
     });
     await buffer.assign(
       denops,
       bufnr,
       new Uint8Array([...stdout, ...stderr]),
       {
-        fileformat: (opts["ff"] ?? opts["fileformat"]),
-        fileencoding: opts["enc"] ?? opts["fileencoding"],
+        fileformat: options.fileformat,
+        fileencoding: options.encoding,
         preprocessor,
       },
     );