coc-git 2.4.6 → 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(() => {
@@ -4862,7 +4886,6 @@ var Bcommits = class extends import_coc2.BasicList {
     this.name = "bcommits";
     this.description = "Commits of current file.";
     this.defaultAction = "show";
-    this.actions = [];
     this.addAction("preview", async (item, context) => {
       let {commit, root} = item.data;
       let lines = [];
@@ -4877,18 +4900,20 @@ var Bcommits = class extends import_coc2.BasicList {
         bufname: commit ? `[commit ${commit}]` : ""
       }, context);
     });
-    this.addAction("show", async (item) => {
+    this.addAction("show", async (item, ctx) => {
       let {commit, root} = item.data;
       if (!commit)
         return;
       let hasFugitive = await nvim.getVar("loaded_fugitive");
       if (hasFugitive) {
-        await nvim.command(`Gedit ${commit}`);
+        let cmd = ctx.options.position === "tab" ? "Gtabedit" : "Gedit";
+        await nvim.command(`${cmd} ${commit}`);
       } else {
+        let cmd = ctx.options.position === "tab" ? "tabe" : "edit";
         let content = await import_coc2.runCommand(`git --no-pager show ${commit}`, {cwd: root});
         let lines = content.trim().split("\n");
         nvim.pauseNotification();
-        nvim.command(`edit +setl\\ buftype=nofile [commit ${commit}]`, true);
+        nvim.command(`${cmd} +setl\\ buftype=nofile [commit ${commit}]`, true);
         nvim.command("setl foldmethod=syntax nobuflisted bufhidden=wipe", true);
         nvim.command("setf git", true);
         nvim.call("append", [0, lines], true);
@@ -4896,7 +4921,7 @@ var Bcommits = class extends import_coc2.BasicList {
         nvim.command(`exe 1`, true);
         await nvim.resumeNotification();
       }
-    });
+    }, {tabPersist: true});
     this.addAction("view", async (item, context) => {
       let {commit, root, file} = item.data;
       let {window: window9, listWindow} = context;
@@ -5129,7 +5154,6 @@ var Commits = class extends import_coc4.BasicList {
     this.name = "commits";
     this.description = "Commits of current project.";
     this.defaultAction = "show";
-    this.actions = [];
     this.cachedCommits = new Map();
     this.addAction("preview", async (item, context) => {
       let {commit, root} = item.data;
@@ -5151,13 +5175,14 @@ var Commits = class extends import_coc4.BasicList {
         bufname: commit ? `[commit ${commit}]` : ""
       }, context);
     });
-    this.addAction("show", async (item) => {
+    this.addAction("show", async (item, ctx) => {
       let {commit, root} = item.data;
       if (!commit)
         return;
       let hasFugitive = await nvim.getVar("loaded_fugitive");
       if (hasFugitive) {
-        await nvim.command(`Gedit ${commit}`);
+        let cmd = ctx.options.position === "tab" ? "Gtabedit" : "Gedit";
+        await nvim.command(`${cmd} ${commit}`);
       } else {
         let lines = this.cachedCommits.get(commit);
         if (!lines) {
@@ -5167,8 +5192,9 @@ var Commits = class extends import_coc4.BasicList {
           lines = content.replace(/\n$/, "").split(/\r?\n/);
           this.cachedCommits.set(commit, lines);
         }
+        let cmd = ctx.options.position === "tab" ? "tabe" : "edit";
         nvim.pauseNotification();
-        nvim.command(`edit +setl\\ buftype=nofile [commit ${commit}]`, true);
+        nvim.command(`${cmd} +setl\\ buftype=nofile [commit ${commit}]`, true);
         nvim.command("setl foldmethod=syntax nobuflisted bufhidden=wipe", true);
         nvim.command("setf git", true);
         nvim.call("append", [0, lines], true);
@@ -5176,7 +5202,7 @@ var Commits = class extends import_coc4.BasicList {
         nvim.command(`exe 1`, true);
         await nvim.resumeNotification();
       }
-    });
+    }, {tabPersist: true});
     this.addAction("reset", async (item) => {
       let {root, commit} = item.data;
       if (!commit)
@@ -5251,7 +5277,7 @@ var Commits = class extends import_coc4.BasicList {
       let content = await runCommand(`git --no-pager diff ${arg}`, {cwd: list[0].data.root});
       let lines = content.replace(/\n$/, "").split("\n");
       let winid = context.listWindow.id;
-      let mod = context.options.position == "top" ? "below" : "above";
+      let mod = context.options.position == "tab" ? "below" : "above";
       nvim.pauseNotification();
       nvim.command("pclose", true);
       nvim.command(`${mod} ${this.previewHeight}sp +setl\\ previewwindow [diff ${arg}]`, true);
@@ -5315,12 +5341,14 @@ var Gfiles = class extends import_coc5.BasicList {
     const preferences = import_coc5.workspace.getConfiguration("coc.preferences");
     let jumpCommand = preferences.get("jumpCommand", "edit");
     for (let name of ["edit", "tabe", "vsplit", "split"]) {
-      this.addAction(name, async (item) => {
+      this.addAction(name, async (item, ctx) => {
         let {root, sha, filepath, branch} = item.data;
         if (!sha)
           return;
         if (branch == "HEAD") {
           let cmd2 = name == "edit" ? jumpCommand : name;
+          if (ctx.options.position === "tab")
+            cmd2 = "tabe";
           let fullpath = import_path2.default.join(root, filepath);
           await import_coc5.workspace.jumpTo(import_coc5.Uri.file(fullpath).toString(), null, cmd2);
           return;
@@ -5336,7 +5364,7 @@ var Gfiles = class extends import_coc5.BasicList {
         nvim.command("setl buftype=nofile nomodifiable bufhidden=wipe nobuflisted", true);
         nvim.command("filetype detect", true);
         await nvim.resumeNotification();
-      });
+      }, {tabPersist: name === "edit"});
     }
     this.addAction("preview", async (item, context) => {
       let {root, sha, filepath, branch} = item.data;
@@ -5406,7 +5434,6 @@ var GStatus = class extends import_coc6.BasicList {
     this.name = "gstatus";
     this.description = "Git status of current project";
     this.defaultAction = "open";
-    this.actions = [];
     this.addLocationActions();
     this.addMultipleAction("add", async (items) => {
       let {root} = items[0].data;
@@ -5631,28 +5658,26 @@ var DocumentManager = class {
     this.conflictSrcId = conflictSrcId;
     this.buffers = new Map();
     this.disposables = [];
+    this.defined = false;
     this.loadConfiguration();
     import_coc8.workspace.onDidChangeConfiguration(this.loadConfiguration, this, this.disposables);
     this.gitStatus = new status_default(service);
-    if (this.enableGutters) {
-      this.defineSigns().catch((e) => {
-        console.error(e.message);
-      });
-    }
-    for (let doc of import_coc8.workspace.documents) {
+    const createBuffer = (doc) => {
       let {uri} = doc;
       service.createBuffer(doc, this.config).then((buf) => {
         if (!buf || import_coc8.workspace.getDocument(uri) == null)
           return;
+        this.defineSigns().catch((e) => {
+          console.error(e.message);
+        });
         this.buffers.set(doc.bufnr, buf);
       });
+    };
+    for (let doc of import_coc8.workspace.documents) {
+      createBuffer(doc);
     }
     import_coc8.workspace.onDidOpenTextDocument(async (e) => {
-      let doc = import_coc8.workspace.getDocument(e.bufnr);
-      let buf = await service.createBuffer(doc, this.config);
-      if (!buf || !import_coc8.workspace.getDocument(e.uri))
-        return;
-      this.buffers.set(e.bufnr, buf);
+      createBuffer(import_coc8.workspace.getDocument(e.bufnr));
     }, null, this.disposables);
     import_coc8.workspace.onDidChangeTextDocument(async (e) => {
       let buf = this.buffers.get(e.bufnr);
@@ -5691,6 +5716,9 @@ var DocumentManager = class {
     }, null, this.disposables);
   }
   async defineSigns() {
+    if (!this.enableGutters || this.defined)
+      return;
+    this.defined = true;
     let {nvim} = this;
     const config = import_coc8.workspace.getConfiguration("git");
     let items = ["Changed", "Added", "Removed", "TopRemoved", "ChangeRemoved"];
@@ -5700,7 +5728,7 @@ var DocumentManager = class {
       let text = config.get(`${section}.text`, "");
       let hlGroup = config.get(`${section}.hlGroup`, "");
       nvim.command(`sign define CocGit${item} text=${text} texthl=CocGit${item}Sign`, true);
-      nvim.command(`hi default link CocGit${item}Sign ${hlGroup}`, true);
+      nvim.command(`highlight default link CocGit${item}Sign ${hlGroup}`, true);
     }
     await nvim.resumeNotification();
   }
@@ -5836,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)
@@ -5925,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"]);
@@ -6554,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;
@@ -7406,7 +7525,6 @@ function addSource(context, resolver) {
       page_idx++;
       try {
         let info = await import_coc13.fetch(page_uri, {headers});
-        console.log(JSON.stringify(info, null, 2));
         if (info.length == 0) {
           break;
         }
@@ -7631,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.6",
+  "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"
@@ -355,7 +359,7 @@
     "@types/node": "^12.12.0",
     "@types/uuid": "^7.0.1",
     "@types/which": "^1.3.2",
-    "coc.nvim": "^0.0.81-next.9",
+    "coc.nvim": "^0.0.81-next.13",
     "colors": "^1.4.0",
     "debounce": "^1.2.0",
     "esbuild": "^0.8.29",