coc-git 2.7.1 → 2.7.3

package/Readme.md

@@ -50,6 +50,10 @@ In your vim/neovim, run command:
 
 - `git.remoteName`: Remote name for fetch github issues., default: `"origin"`
 
+- `git.diffOptions`: Options for git diff command, eg: `["--ignore-all-space"]`, default: `[]`
+
+- `git.foldContext`: Line count to leave below and above the fold, default: `0`.
+
 - `git.browserRemoteName`: Remote name for browserOpen and copyUrl., default: `""`
 
 - `git.browserBranchName`: Branch name for browserOpen and copyUrl., default: `""`

package/lib/index.js

@@ -4653,7 +4653,7 @@ function spawnCommand(cmd, args, cwd) {
       res += data.toString();
     });
     cp2.stderr.on("data", (data) => {
-      import_coc.window.showMessage(`"${cmd} ${args.join(" ")}" error: ${data.toString()}`, "error");
+      import_coc.window.showErrorMessage(`"${cmd} ${args.join(" ")}" error: ${data.toString()}`);
     });
     cp2.on("close", (code) => {
       if (code != 0) {
@@ -4903,7 +4903,7 @@ var CommitsTask = class extends import_events.EventEmitter {
 };
 var Bcommits = class extends import_coc2.BasicList {
   constructor(nvim, manager) {
-    super(nvim);
+    super();
     this.manager = manager;
     this.name = "bcommits";
     this.description = "Commits of current file.";
@@ -5158,7 +5158,7 @@ var CommitsTask2 = class extends import_events2.EventEmitter {
 };
 var Commits = class extends import_coc4.BasicList {
   constructor(nvim, manager) {
-    super(nvim);
+    super();
     this.manager = manager;
     this.name = "commits";
     this.description = "Commits of current project.";
@@ -5251,7 +5251,7 @@ var Commits = class extends import_coc4.BasicList {
       } else {
         arg = `${list[1].data.commit} ${list[0].data.commit}`;
       }
-      let content = await runCommand(`git --no-pager diff --no-ext-diff ${arg}`, { cwd: list[0].data.root });
+      let content = await runCommand(`git --no-pager diff --no-ext-diff ${this.manager.diffOptions.join(" ")} ${arg}`, { cwd: list[0].data.root });
       let lines = content.replace(/\n$/, "").split("\n");
       nvim.pauseNotification();
       nvim.command(`tabe [diff ${arg}]`, true);
@@ -5275,7 +5275,7 @@ var Commits = class extends import_coc4.BasicList {
       } else {
         arg = `${list[1].data.commit} ${list[0].data.commit}`;
       }
-      let content = await runCommand(`git --no-pager diff --no-ext-diff ${arg}`, { cwd: list[0].data.root });
+      let content = await runCommand(`git --no-pager diff ${this.manager.diffOptions.join(" ")} --no-ext-diff ${arg}`, { cwd: list[0].data.root });
       let lines = content.replace(/\n$/, "").split("\n");
       let winid = context.listWindow.id;
       let mod = context.options.position == "tab" ? "below" : "above";
@@ -5330,7 +5330,7 @@ var import_coc5 = require("coc.nvim");
 var import_path2 = __toESM(require("path"));
 var Gfiles = class extends import_coc5.BasicList {
   constructor(nvim, manager) {
-    super(nvim);
+    super();
     this.manager = manager;
     this.name = "gfiles";
     this.description = "view files on different branches (or commits, or tags)";
@@ -5366,7 +5366,7 @@ var Gfiles = class extends import_coc5.BasicList {
     this.addAction("preview", async (item, context) => {
       let { root, sha, filepath, branch } = item.data;
       if (!sha) return;
-      let content = await runCommand(`git --no-pager diff --no-ext-diff ${branch} -- ${shellescape(filepath)}`, { cwd: root });
+      let content = await runCommand(`git --no-pager diff ${this.manager.diffOptions.join(" ")} --no-ext-diff ${branch} -- ${shellescape(filepath)}`, { cwd: root });
       let lines = content.replace(/\n$/, "").split("\n");
       await this.preview({
         lines,
@@ -5423,7 +5423,7 @@ var STATUS_MAP = {
 };
 var GStatus = class extends import_coc6.BasicList {
   constructor(nvim, manager) {
-    super(nvim);
+    super();
     this.manager = manager;
     this.name = "gstatus";
     this.description = "Git status of current project";
@@ -5450,7 +5450,7 @@ var GStatus = class extends import_coc6.BasicList {
       try {
         await nvim.command(`G commit -v ${filesArg}`);
       } catch (e) {
-        import_coc6.window.showMessage(`G commit command failed, make sure fugitive installed.`, "error");
+        import_coc6.window.showErrorMessage(`G commit command failed, make sure fugitive installed.`);
       }
     });
     this.addAction("reset", async (item) => {
@@ -5494,7 +5494,7 @@ var GStatus = class extends import_coc6.BasicList {
         }, context);
         return;
       }
-      let args = ["--no-pager", "diff", "--no-ext-diff"];
+      let args = ["--no-pager", "diff", "--no-ext-diff", ...this.manager.diffOptions];
       if (index_symbol == "M" && tree_symbol != "M") {
         args.push("--cached");
       }
@@ -5817,6 +5817,8 @@ var DocumentManager = class {
     let obj = {
       remoteName: config.get("remoteName", "origin"),
       diffRevision: config.get("diffRevision", ""),
+      foldContext: config.get("foldContext", 0),
+      diffOptions: config.get("diffOptions", []),
       issueFormat: config.get("issueFormat", "#%i"),
       virtualTextPrefix: config.get("virtualTextPrefix", "     "),
       addGBlameToVirtualText: config.get("addGBlameToVirtualText", false),
@@ -5871,6 +5873,9 @@ var DocumentManager = class {
   get git() {
     return this.service.git;
   }
+  get diffOptions() {
+    return this.config.diffOptions;
+  }
   async toggleGutters() {
     let enabled = this.enableGutters;
     let config = import_coc10.workspace.getConfiguration("git");
@@ -5978,7 +5983,7 @@ var DocumentManager = class {
     let root = await this.resolveGitRootFromBufferOrCwd(bufnr);
     let extra = this.config.pushArguments;
     if (!root) {
-      import_coc10.window.showMessage(`not belongs to git repository.`, "warning");
+      import_coc10.window.showWarningMessage(`not belongs to git repository.`);
       return;
     }
     if (args && args.length) {
@@ -5989,12 +5994,12 @@ var DocumentManager = class {
     let output = await repo.safeRun(["remote"]);
     let remote = output.trim().split(/\r?\n/)[0];
     if (!remote) {
-      import_coc10.window.showMessage(`remote not found`, "warning");
+      import_coc10.window.showWarningMessage(`remote not found`);
       return;
     }
     output = await repo.safeRun(["rev-parse", "--abbrev-ref", "HEAD"]);
     if (!output) {
-      import_coc10.window.showMessage(`current branch not found`, "warning");
+      import_coc10.window.showWarningMessage(`current branch not found`);
       return;
     }
     await import_coc10.window.runTerminalCommand(`git push ${remote} ${output}${extra.length ? " " + extra.join(" ") : ""}`, root, true);
@@ -6002,7 +6007,7 @@ var DocumentManager = class {
   get buffer() {
     return import_coc10.workspace.nvim.call("bufnr", "%").then((bufnr) => {
       let buf = this.buffers.get(bufnr);
-      if (!buf) import_coc10.window.showMessage(`Cant't resolve git repository for current buffer.`, "warning");
+      if (!buf) import_coc10.window.showWarningMessage(`Cant't resolve git repository for current buffer.`);
       return buf;
     });
   }
@@ -6013,7 +6018,7 @@ var DocumentManager = class {
     let bufnr = await import_coc10.workspace.nvim.call("bufnr", "%");
     let root = await this.resolveGitRootFromBufferOrCwd(bufnr);
     if (!root) {
-      import_coc10.window.showMessage(`not belongs to git repository.`, "warning");
+      import_coc10.window.showWarningMessage(`not belongs to git repository.`);
       return null;
     }
     let repo = this.service.getRepoFromRoot(root);
@@ -6763,7 +6768,7 @@ var GitBuffer = class {
     let line = await import_coc13.workspace.nvim.call("line", ".");
     let diff = this.getChunk(line);
     if (!diff) {
-      import_coc13.window.showMessage("Not positioned in git chunk", "error");
+      import_coc13.window.showErrorMessage("Not positioned in git chunk");
       return;
     }
     let head;
@@ -7064,7 +7069,7 @@ var GitBuffer = class {
       let info;
       for (let line of r.stdout.trim().split(/\r?\n/)) {
         line = line.trim();
-        if (line.startsWith("External file (--contents)")) {
+        if (/^(author |committer )?External file \(--contents\)/.test(line)) {
           line = "Not committed yet.";
         }
         let ms = line.match(/^([A-Za-z0-9]+)\s(\d+)\s(\d+)\s(\d+)/);
@@ -7103,7 +7108,7 @@ var GitBuffer = class {
   async diffCached() {
     let res = await this.repo.safeRun(["diff", "--cached"]);
     if (!res.trim()) {
-      import_coc13.window.showMessage("Empty diff");
+      import_coc13.window.showWarningMessage("Empty diff");
       return;
     }
     let { nvim } = import_coc13.workspace;
@@ -7119,7 +7124,7 @@ var GitBuffer = class {
   async nextConflict() {
     let { nvim } = import_coc13.workspace;
     if (!this.conflicts.length) {
-      import_coc13.window.showMessage("No conflicts detected", "warning");
+      import_coc13.window.showWarningMessage("No conflicts detected");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7136,7 +7141,7 @@ var GitBuffer = class {
   async prevConflict() {
     let { nvim } = import_coc13.workspace;
     if (!this.conflicts.length) {
-      import_coc13.window.showMessage("No conflicts detected", "warning");
+      import_coc13.window.showWarningMessage("No conflicts detected", "warning");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7154,7 +7159,7 @@ var GitBuffer = class {
     const { nvim } = import_coc13.workspace;
     let conflicts = this.conflicts;
     if (!conflicts || conflicts.length == 0) {
-      import_coc13.window.showMessage("No conflicts detected");
+      import_coc13.window.showWarningMessage("No conflicts detected");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7174,7 +7179,7 @@ var GitBuffer = class {
         }
       }
     }
-    import_coc13.window.showMessage("Not positioned on a conflict");
+    import_coc13.window.showWarningMessage("Not positioned on a conflict");
   }
   async browser(action = "open", range, permalink = false) {
     let { nvim } = import_coc13.workspace;
@@ -7197,7 +7202,7 @@ var GitBuffer = class {
     }
     let output = await this.repo.safeRun(["remote"]);
     if (!output.trim()) {
-      import_coc13.window.showMessage(`No remote found`, "warning");
+      import_coc13.window.showWarningMessage(`No remote found`);
       return;
     }
     let names = output.trim().split(/\r?\n/);
@@ -7206,7 +7211,7 @@ var GitBuffer = class {
       if (names.includes(browserRemoteName)) {
         names = [browserRemoteName];
       } else {
-        import_coc13.window.showMessage("Configured git.browserRemoteName missing from remote list", "warning");
+        import_coc13.window.showWarningMessage("Configured git.browserRemoteName missing from remote list");
         return;
       }
     }
@@ -7231,16 +7236,17 @@ var GitBuffer = class {
         await import_coc13.workspace.openResource(urls[0]);
       } else {
         nvim.command(`let @+ = '${urls[0]}'`, true);
-        import_coc13.window.showMessage("Copied url to clipboard");
+        import_coc13.window.showInformationMessage("Copied url to clipboard");
       }
     } else if (urls.length > 1) {
-      let idx = await import_coc13.window.showQuickpick(urls, "Select url:");
-      if (idx >= 0) {
+      let url = await import_coc13.window.showQuickPick(urls, { canPickMany: false, title: "Pick remote url" });
+      if (url) {
         if (action == "open") {
-          await import_coc13.workspace.openResource(urls[idx]);
+          await import_coc13.workspace.openResource(url);
         } else {
-          nvim.command(`let @+ = '${urls[idx]}'`, true);
-          import_coc13.window.showMessage("Copied url to clipboard");
+          nvim.command(`let @+ = '${url}'`, true);
+          nvim.command(`let @* = '${url}'`, true);
+          import_coc13.window.showInformationMessage("Copied url to clipboard");
         }
       }
     }
@@ -7249,7 +7255,7 @@ var GitBuffer = class {
   async showCommit() {
     let indexed = await this.repo.isIndexed(this.relpath);
     if (!indexed) {
-      import_coc13.window.showMessage(`"${this.relpath}" not indexed.`, "warning");
+      import_coc13.window.showWarningMessage(`"${this.relpath}" not indexed.`);
       return;
     }
     let nvim = import_coc13.workspace.nvim;
@@ -7260,7 +7266,7 @@ var GitBuffer = class {
     if (!output.length) return;
     let commit = output.match(/^\S+/)[0];
     if (/^0+$/.test(commit)) {
-      import_coc13.window.showMessage("not committed yet!", "warning");
+      import_coc13.window.showWarningMessage("not committed yet!");
       return;
     }
     let useFloating = this.config.showCommitInFloating;
@@ -7297,12 +7303,20 @@ var GitBuffer = class {
     if (!doc) return;
     let infos = this.currentSigns;
     if (!infos || infos.length == 0) {
-      import_coc13.window.showMessage("No changes", "warning");
+      import_coc13.window.showWarningMessage("No changes");
       return;
     }
     let lnums = infos.map((o) => o.lnum);
+    let foldContext = this.config.foldContext;
+    let max = this.doc.lineCount;
     let ranges = [];
     let start = null;
+    const addRange = (from, to) => {
+      let s = plus(from, foldContext, max);
+      let e = minus(to, foldContext, 0);
+      if (e - s <= 0) return;
+      ranges.push([s, e]);
+    };
     for (let i = 1; i <= doc.lineCount; i++) {
       let fold = lnums.indexOf(i) == -1;
       if (fold && start == null) {
@@ -7310,11 +7324,11 @@ var GitBuffer = class {
         continue;
       }
       if (start != null && !fold) {
-        ranges.push([start, i - 1]);
+        addRange(start, i - 1);
         start = null;
       }
       if (start != null && fold && i == doc.lineCount) {
-        ranges.push([start, i]);
+        addRange(start, i);
       }
     }
     let enabled = this.foldEnabled;
@@ -7333,6 +7347,8 @@ var GitBuffer = class {
       nvim.call("setpos", [".", cursor], true);
       await nvim.resumeNotification();
     } else {
+      console.log(33);
+      console.log(ranges);
       this.foldEnabled = true;
       let [foldmethod, foldenable, foldlevel] = await nvim.eval("[&foldmethod,&foldenable,&foldlevel]");
       this.foldSettings = {
@@ -7366,7 +7382,7 @@ var GitBuffer = class {
   async parseConflicts() {
     if (!this.hasConflicts || !this.config.conflict.enabled) return;
     const lines = this.doc.getLines();
-    const revPattern = "([0-9A-Za-z_.:/]+)";
+    const revPattern = "([0-9A-Za-z_.:/-]+)";
     const startPattern = new RegExp(`^<{7} (${revPattern})(:? .+)?$`);
     const sepPattern = new RegExp(`^={7}$`);
     const endPattern = new RegExp(`^>{7} (${revPattern})(:? .+)?$`);
@@ -7442,19 +7458,20 @@ var GitBuffer = class {
     let { nvim } = import_coc13.workspace;
     nvim.pauseNotification();
     buffer.clearNamespace(this.config.conflictSrcId, 0, -1);
+    const srcId = this.config.conflictSrcId;
     conflicts.map((conflict) => {
       buffer.addHighlight({
         hlGroup: currentHlGroup,
         line: conflict.start,
         colStart: 0,
         colEnd: 1e4,
-        srcId: this.config.conflictSrcId
+        srcId
       });
       for (let line = conflict.start - 1; line < conflict.sep - 1; line++) {
-        buffer.addHighlight({ hlGroup: currentHlGroup, line, srcId: this.config.conflictSrcId });
+        buffer.addHighlight({ hlGroup: currentHlGroup, line, srcId });
       }
       for (let line = conflict.end - 1; line >= conflict.sep; line--) {
-        buffer.addHighlight({ hlGroup: incomingHlGroup, line, srcId: this.config.conflictSrcId });
+        buffer.addHighlight({ hlGroup: incomingHlGroup, line, srcId });
       }
     });
     nvim.resumeNotification(false, true);
@@ -7519,6 +7536,16 @@ var GitBuffer = class {
     this.currentSigns = void 0;
   }
 };
+function plus(val, count, max) {
+  if (!count) return val;
+  val = val + count;
+  return Math.min(max, val);
+}
+function minus(val, count, min) {
+  if (!count) return val;
+  val = val - count;
+  return Math.max(min, val);
+}
 
 // src/model/service.ts
 var import_path8 = __toESM(require("path"));
@@ -7871,10 +7898,10 @@ async function activate(context) {
   const { subscriptions } = context;
   let gitInfo;
   try {
-    let pathHint = config.get("command");
+    let pathHint = config.get("command", "git");
     gitInfo = await findGit(pathHint, (path9) => context.logger.info(`Looking for git in: ${path9}`));
   } catch (e) {
-    import_coc16.window.showMessage("git command required for coc-git", "error");
+    import_coc16.window.showErrorMessage("git command required for coc-git");
     return;
   }
   const virtualTextSrcId = await import_coc16.workspace.nvim.createNamespace("coc-git-virtual");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.7.1",
+  "version": "2.7.3",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -95,6 +95,21 @@
           "scope": "window",
           "description": "Remote name for fetch github issues."
         },
+        "git.diffOptions": {
+          "type": "array",
+          "default": [],
+          "description": "Options for git diff command, eg: [\"--ignore-all-space\"]",
+          "scope": "window",
+          "items": {
+            "type": "string"
+          }
+        },
+        "git.foldContext": {
+          "type": "number",
+          "default": 0,
+          "scope": "window",
+          "description": "Line count to leave below and above the fold."
+        },
         "git.browserRemoteName": {
           "type": "string",
           "default": "",