coc-git 2.7.11 → 2.7.12

package/history.md

@@ -1,3 +1,7 @@
+## 2.7.12
+
+- fix: address audited git workflow issues (eb6ee85)
+
 ## 2.7.11
 
 - add AGENTS.md (34ea156)

package/lib/index.js

@@ -4757,6 +4757,16 @@ var Bcommits = class extends import_coc.BasicList {
 // src/lists/branches.ts
 var import_coc2 = require("coc.nvim");
 var import_safe = __toESM(require_safe());
+function parseBranchLine(line) {
+  const name = line.slice(2);
+  if (!name || name.includes(" -> ")) return void 0;
+  const remote = name.startsWith("remotes/");
+  return {
+    current: line[0] == "*",
+    branch: remote ? name.slice("remotes/".length) : name,
+    remote
+  };
+}
 var Branches = class {
   constructor(nvim, manager) {
     this.manager = manager;
@@ -4828,15 +4838,14 @@ var Branches = class {
     if (output == null) return;
     output = output.replace(/\s+$/, "");
     for (let line of output.split(/\r?\n/)) {
-      let remote = line.slice(2).startsWith("remotes/");
+      const data = parseBranchLine(line);
+      if (!data) continue;
       res.push({
         label: import_safe.default.yellow(line.slice(0, 2)) + line.slice(2),
         filterText: line.slice(2),
         data: {
-          current: line[0] == "*",
           root,
-          branch: remote ? line.slice(10) : line.slice(2),
-          remote
+          ...data
         }
       });
     }
@@ -5092,14 +5101,12 @@ var Gfiles = class extends import_coc4.BasicList {
     this.detail = "Pass git sha as first command argument, when empty, HEAD is used.\nExample: :CocList gfiles 7b5c5cb";
     this.defaultAction = "edit";
     this.actions = [];
-    const preferences = import_coc4.workspace.getConfiguration("coc.preferences");
-    let jumpCommand = preferences.get("jumpCommand", "edit");
     for (let name of ["edit", "tabe", "vsplit", "split"]) {
       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;
+          let cmd2 = name == "edit" ? import_coc4.workspace.getConfiguration("coc.preferences").get("jumpCommand", "edit") : name;
           if (ctx.options.position === "tab") cmd2 = "tabe";
           let fullpath = import_path.default.join(root, filepath);
           await import_coc4.workspace.jumpTo(import_coc4.Uri.file(fullpath).toString(), null, cmd2);
@@ -5107,7 +5114,7 @@ var Gfiles = class extends import_coc4.BasicList {
         }
         let content = (await this.manager.git.exec(root, ["cat-file", "-p", sha])).stdout;
         let lines = content.replace(/\n$/, "").split("\n");
-        let cmd = name == "edit" ? jumpCommand : name;
+        let cmd = name == "edit" ? import_coc4.workspace.getConfiguration("coc.preferences").get("jumpCommand", "edit") : name;
         let bufferName = await nvim.call("fnameescape", [`(${branch}) ${filepath}`]);
         nvim.pauseNotification();
         nvim.command(`${cmd} ${bufferName}`, true);
@@ -5215,7 +5222,7 @@ function quoteGitPath(filepath) {
 }
 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} @@`;
+  let head = `@@ -${chunk.add.lnum},${chunk.add.count} +${chunk.remove.lnum},${chunk.remove.count} @@`;
   if (!head) return "";
   const from = quoteGitPath(`a/${relpath}`);
   const to = quoteGitPath(`b/${relpath}`);
@@ -5331,15 +5338,22 @@ function getUrl(fix, repoURL, name, filepath, lines) {
   }
   const encodePath = (value) => value.split("/").map(encodeURIComponent).join("/");
   let url = repoURL + "/blob/" + encodePath(name) + "/" + encodePath(filepath) + (anchor ? "#" + encodeURIComponent(anchor) : "");
-  let parts = fix.split("|");
-  if (parts.length < 2) return url;
+  const separator = fix.lastIndexOf("|");
+  if (separator === -1) return url;
   try {
-    let match = RegExp(parts[0]), result = parts[1];
+    let match = RegExp(fix.slice(0, separator)), result = fix.slice(separator + 1);
     return url.replace(match, result);
   } catch (_e) {
     return url;
   }
 }
+async function feedTreeToggleKey(nvim, configuredKey) {
+  let key = configuredKey;
+  if (/^<[^"\\\r\n]+>$/.test(configuredKey)) {
+    key = await nvim.call("eval", [`"\\${configuredKey}"`]);
+  }
+  await nvim.call("feedkeys", [key, "in"]);
+}
 function parseVersion(raw) {
   return raw.replace(/^git version /, "");
 }
@@ -5419,6 +5433,21 @@ function onceEvent(event) {
 }
 
 // src/lists/gstatus.ts
+async function commitWithFugitive(nvim, items) {
+  let { root } = items[0].data;
+  const cwd = await nvim.call("getcwd");
+  let escapedRoot = await nvim.call("fnameescape", [root]);
+  let escapedCwd = await nvim.call("fnameescape", [cwd]);
+  await nvim.command(`lcd ${escapedRoot}`);
+  try {
+    let escapedFiles = await Promise.all(items.map((item) => nvim.call("fnameescape", [item.data.relative])));
+    await nvim.command(`G commit -v -- ${escapedFiles.join(" ")}`);
+  } catch (e) {
+    import_coc6.window.showErrorMessage(`G commit command failed, make sure fugitive installed.`);
+  } finally {
+    await nvim.command(`lcd ${escapedCwd}`);
+  }
+}
 var STATUS_MAP = {
   " ": " ",
   M: import_safe2.default.cyan("~"),
@@ -5454,15 +5483,7 @@ var GStatus = class extends import_coc6.BasicList {
       }]);
     });
     this.addMultipleAction("commit", async (items) => {
-      let { root } = items[0].data;
-      let escapedRoot = await nvim.call("fnameescape", [root]);
-      await nvim.command(`lcd ${escapedRoot}`);
-      let escapedFiles = await Promise.all(items.map((item) => nvim.call("fnameescape", [item.data.relative])));
-      try {
-        await nvim.command(`G commit -v -- ${escapedFiles.join(" ")}`);
-      } catch (e) {
-        import_coc6.window.showErrorMessage(`G commit command failed, make sure fugitive installed.`);
-      }
+      await commitWithFugitive(nvim, items);
     });
     this.addAction("reset", async (item) => {
       let { staged, tree, relative, root } = item.data;
@@ -5604,20 +5625,20 @@ var GChunks = class extends import_coc7.BasicList {
       let stagedDiff = await buf.repo.getStagedChunks(relpath);
       let chunks = (_a = Object.values(stagedDiff)[0]) != null ? _a : [];
       if (chunks.length > 0) {
-        for (let diff of chunks) {
+        for (let chunk of chunks) {
           let adjust = 0;
           let stagedSign = import_safe3.default.green("*");
-          let line = diff.add.lnum;
-          for (let diff2 of diffs) {
-            if (diff2.end >= line) {
+          let line = chunk.add.lnum;
+          for (let unstagedDiff of diffs) {
+            if (unstagedDiff.end >= line) {
               break;
             }
-            adjust += diff2.added.count;
-            adjust -= diff2.removed.count;
+            adjust += unstagedDiff.added.count;
+            adjust -= unstagedDiff.removed.count;
           }
           line += adjust;
           res.push({
-            label: `${stagedSign} Line:${line} ${diff.lines[0]}`,
+            label: `${stagedSign} Line:${line} ${chunk.lines[0]}`,
             data: {
               line
             }
@@ -5700,8 +5721,8 @@ var GitStatus = class {
       if (!this._enabled) this.setGitStatus("");
       this.scheduleRefresh(0);
     }, null, this.disposables);
-    import_coc9.events.on("BufEnter", this.refresh, this, this.disposables);
-    import_coc9.events.on("FocusGained", this.refresh, this, this.disposables);
+    import_coc9.events.on("BufEnter", () => this.scheduleRefresh(100), this, this.disposables);
+    import_coc9.events.on("FocusGained", () => this.scheduleRefresh(100), this, this.disposables);
     import_coc9.events.on("BufWritePost", () => this.scheduleRefresh(50), this, this.disposables);
     this.disposables.push({ dispose: () => this.clearTimer() });
     this.scheduleRefresh(300);
@@ -7342,14 +7363,7 @@ var GitBuffer = class {
       import_coc12.window.showErrorMessage("Not positioned in git chunk");
       return;
     }
-    let head;
-    if (diff.changeType === "add" /* Add */) {
-      head = `@@ -${diff.removed.start + 1},0 +${diff.removed.start + 1},${diff.added.count} @@`;
-    } else if (diff.changeType === "delete" /* Delete */) {
-      head = `@@ -${diff.removed.start},${diff.removed.count} +${diff.removed.start},0 @@`;
-    } else if (diff.changeType === "changed" /* Change */) {
-      head = `@@ -${diff.removed.start},${diff.removed.count} +${diff.removed.start},${diff.added.count} @@`;
-    }
+    const head = diff.head;
     const from = quoteGitPath(`a/${relpath}`);
     const to = quoteGitPath(`b/${relpath}`);
     const lines = [
@@ -8546,6 +8560,9 @@ var GitService = class {
 var import_coc16 = require("coc.nvim");
 var import_safe5 = __toESM(require_safe());
 var import_url2 = require("url");
+function isIssuePage(value) {
+  return Array.isArray(value);
+}
 function byteSlice(content, start, end) {
   let buf = Buffer.from(content, "utf8");
   return buf.slice(start, end).toString("utf8");
@@ -8640,7 +8657,7 @@ function addSource(context, service) {
         const pageUri = `${uri}&page=${pageIndex}`;
         pageIndex++;
         let info = await (0, import_coc16.fetch)(pageUri, { headers: { "Private-Token": token } });
-        if (!info.length) {
+        if (!isIssuePage(info) || info.length === 0) {
           break;
         }
         for (let i = 0, len = info.length; i < len; i++) {
@@ -8677,7 +8694,7 @@ function addSource(context, service) {
       page_idx++;
       try {
         let info = await (0, import_coc16.fetch)(page_uri, { headers });
-        if (info.length == 0) {
+        if (!isIssuePage(info) || info.length === 0) {
           break;
         }
         for (let i = 0, len = info.length; i < len; i++) {
@@ -9127,9 +9144,7 @@ var CommitFilesController = class {
     const element = node;
     if (element.kind !== "root" && element.kind !== "directory") return;
     const configuredKey = import_coc17.workspace.getConfiguration("tree").get("key.toggle", "t");
-    const key = configuredKey.startsWith("<") && configuredKey.endsWith(">") ? `\\${configuredKey}` : configuredKey;
-    const escaped = key.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    await import_coc17.workspace.nvim.call("eval", [`feedkeys("${escaped}", "in")`]);
+    await feedTreeToggleKey(import_coc17.workspace.nvim, configuredKey);
   }
   async open(revision, requestedRoot, options = {}) {
     var _a;
@@ -9626,9 +9641,7 @@ var StatusFilesController = class {
     const element = node;
     if (element.kind !== "root" && element.kind !== "directory") return;
     const configuredKey = import_coc18.workspace.getConfiguration("tree").get("key.toggle", "t");
-    const key = configuredKey.startsWith("<") && configuredKey.endsWith(">") ? `\\${configuredKey}` : configuredKey;
-    const escaped = key.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    await import_coc18.workspace.nvim.call("eval", [`feedkeys("${escaped}", "in")`]);
+    await feedTreeToggleKey(import_coc18.workspace.nvim, configuredKey);
   }
   async refresh() {
     const session = this.session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.7.11",
+  "version": "2.7.12",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",