coc-git 2.4.8 → 2.4.9

package/Readme.md

@@ -222,6 +222,7 @@ related commands.
 - `:CocCommand git.chunkInfo` Show chunk info under cursor.
 - `:CocCommand git.chunkUndo` Undo current chunk.
 - `:CocCommand git.chunkStage` Stage current chunk.
+- `:CocCommand git.chunkUnstage` Unstage chunk that contains current line.
 - `:CocCommand git.diffCached` Show cached diff in preview window.
 - `:CocCommand git.showCommit` Show commit of current chunk.
 - `:CocCommand git.browserOpen` Open current line in browser

package/lib/index.js

@@ -4565,6 +4565,30 @@ var import_child_process = __toModule(require("child_process"));
 var import_coc = __toModule(require("coc.nvim"));
 var import_path = __toModule(require("path"));
 var import_which = __toModule(require_which());
+function reverseLine(line) {
+  if (line.startsWith("-"))
+    return "+" + line.slice(1);
+  if (line.startsWith("+"))
+    return "-" + line.slice(1);
+  return line;
+}
+function createUnstagePatch(relpath, chunk) {
+  if (chunk.remove.count == 0 && chunk.add.count == 0)
+    return "";
+  let head = `@@ -${chunk.add.lnum},${chunk.add.count} +${chunk.add.lnum + 1 - chunk.add.count},${chunk.remove.count} @@`;
+  if (!head)
+    return "";
+  const lines = [
+    `diff --git a/${relpath} b/${relpath}`,
+    `index 000000..000000 100644`,
+    `--- a/${relpath}`,
+    `+++ b/${relpath}`,
+    head
+  ];
+  lines.push(...chunk.lines.map((s) => reverseLine(s)));
+  lines.push("");
+  return lines.join("\n");
+}
 function wait(ms) {
   return new Promise((resolve) => {
     setTimeout(() => {
@@ -5840,6 +5864,12 @@ var DocumentManager = class {
       return;
     await buf.chunkStage();
   }
+  async chunkUnstage() {
+    let buf = await this.buffer;
+    if (!buf)
+      return;
+    await buf.chunkUnstage();
+  }
   async chunkUndo() {
     let buf = await this.buffer;
     if (buf)
@@ -5929,6 +5959,48 @@ var Repo = class {
     this.channel = channel;
     this.root = root;
   }
+  async getStagedChunks(relpath) {
+    let args = ["--no-pager", "diff", "-p", "-U0", "--no-color", "--staged"];
+    if (relpath)
+      args.push(toUnixSlash(relpath));
+    const result = await this.exec(args);
+    if (!result.stdout) {
+      throw new Error(`No staged result.`);
+    }
+    let res = {};
+    let idx = 0;
+    let lines = result.stdout.split(/\r?\n/);
+    let curr;
+    let fsPath;
+    while (idx < lines.length) {
+      let line = lines[idx];
+      if (fsPath && line.startsWith("@@")) {
+        curr = void 0;
+        let ms = line.match(/^@@\s+-(\d+),?(\d*)\s+\+(\d+),?(\d*)\s+@@/);
+        if (ms) {
+          curr = {
+            remove: {lnum: Number(ms[1]), count: ms[2] ? Number(ms[2]) : 1},
+            add: {lnum: Number(ms[3]), count: ms[4] ? Number(ms[4]) : 1},
+            lines: []
+          };
+          res[fsPath] = res[fsPath] || [];
+          res[fsPath].push(curr);
+        }
+      } else if (curr && /^[+\-]/.test(line)) {
+        curr.lines.push(line);
+      } else if (line.startsWith("diff --git")) {
+        let ms = line.match(/diff\s--git\sa\/(.*)\sb\//);
+        if (ms) {
+          fsPath = ms[1];
+          curr = void 0;
+          idx += 4;
+          continue;
+        }
+      }
+      idx++;
+    }
+    return res;
+  }
   async getHEAD() {
     try {
       const result = await this.exec(["symbolic-ref", "--short", "HEAD"]);
@@ -6558,6 +6630,49 @@ var GitBuffer = class {
       this.channel.appendLine(`[Error] ${e.message}`);
     }
   }
+  async chunkUnstage() {
+    let {nvim} = import_coc11.workspace;
+    const {diffs} = this;
+    let line = await nvim.call("line", ".");
+    let adjust = 0;
+    let invalid = false;
+    for (let diff of diffs) {
+      if (diff.end >= line) {
+        if (diff.start <= line && diff.changeType != ChangeType.Delete) {
+          import_coc11.window.showErrorMessage(`Current line contains unstaged change.`);
+          invalid = true;
+        }
+        break;
+      }
+      adjust -= diff.added.count;
+      adjust += diff.removed.count;
+    }
+    if (invalid)
+      return;
+    line = line + adjust;
+    let stagedDiff = await this.repo.getStagedChunks(this.relpath);
+    let chunks = Object.values(stagedDiff)[0];
+    if (!chunks.length) {
+      import_coc11.window.showErrorMessage(`Staged chunk not found`);
+      return;
+    }
+    let chunk = chunks.find((o) => o.add.lnum <= line && o.add.lnum + o.add.count >= line);
+    if (!chunk) {
+      import_coc11.window.showErrorMessage(`Unable to find staged chunk on current line`);
+      return;
+    }
+    this.channel.appendLine(`[Info] resolved chunk ${JSON.stringify(chunk, null, 2)}`);
+    let patch = createUnstagePatch(this.relpath, chunk);
+    if (!patch)
+      return;
+    try {
+      await this.git.exec(this.repo.root, ["apply", "--cached", "--unidiff-zero", "-"], {input: patch});
+      this.refresh();
+    } catch (e) {
+      import_coc11.window.showErrorMessage(`Unable to apply patch: ${e.message}`);
+      this.channel.appendLine(`[Error] ${e.message}`);
+    }
+  }
   async nextChunk() {
     const {diffs} = this;
     let {nvim} = import_coc11.workspace;
@@ -7634,6 +7749,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.commands.registerCommand("git.chunkStage", async () => {
     await manager.chunkStage();
   }));
+  subscriptions.push(import_coc14.commands.registerCommand("git.chunkUnstage", async () => {
+    await manager.chunkUnstage();
+  }));
   subscriptions.push(import_coc14.commands.registerCommand("git.chunkUndo", async () => {
     await manager.chunkUndo();
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -35,6 +35,10 @@
         "title": "Stage current chunk.",
         "command": "git.chunkStage"
       },
+      {
+        "title": "Unstage chunk that contains current line",
+        "command": "git.chunkUnstage"
+      },
       {
         "title": "Undo current chunk.",
         "command": "git.chunkUndo"