coc-git 2.7.2 → 2.7.4

package/Readme.md

@@ -30,7 +30,7 @@ In your vim/neovim, run command:
 - Git related lists, including `issues`, `gfiles`, `gstatus`, `commits`, `branches` & `bcommits`
 - Keymaps for git chunks, including `<Plug>(coc-git-chunkinfo)` `<Plug>(coc-git-nextchunk)` & `<Plug>(coc-git-prevchunk)` ,
 - Commands for chunks, including `git.chunkInfo` `git.chunkStage` `git.chunkUndo` and more.
-- Keymaps for git conflicts, including `<Plug>(coc-git-nextconflict)`, `<Plug>(coc-git-prevconflict)`, `<Plug>(coc-git-keepcurrent)`, `<Plug>(coc-git-keepincoming)` & `<Plug>(coc-git-keepboth)`.
+- Keymaps & commands for git conflicts.
 - Completion support for semantic commit.
 - Completion support for GitHub/GitLab issues.
 
@@ -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),
@@ -5851,7 +5853,8 @@ var DocumentManager = class {
       conflict: {
         enabled: config.get("conflict.enabled", true),
         currentHlGroup: config.get("conflict.current.hlGroup", "DiffChange"),
-        incomingHlGroup: config.get("conflict.incoming.hlGroup", "DiffAdd")
+        incomingHlGroup: config.get("conflict.incoming.hlGroup", "DiffAdd"),
+        commonHlGroup: config.get("conflict.common.hlGroup", "DiffText")
       },
       floatConfig: config.get("floatConfig", {}),
       gstatus: {
@@ -5871,6 +5874,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 +5984,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 +5995,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 +6008,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 +6019,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);
@@ -6677,6 +6683,11 @@ register("zh_CN", zh_CN_default);
 // src/model/buffer.ts
 var import_url = require("url");
 var signGroup = "CocGit";
+var revPattern = "([0-9A-Za-z_.:/-]+)";
+var startPattern = new RegExp(`^<{7} (${revPattern})(:? .+)?$`);
+var sepPattern = new RegExp(`^={7}$`);
+var endPattern = new RegExp(`^>{7} (${revPattern})(:? .+)?$`);
+var commonPattern = /^\|{7}\smerged\scommon\sancestors/;
 var GitBuffer = class {
   constructor(doc, config, relpath, repo, git, channel, floatFactory) {
     this.doc = doc;
@@ -7064,7 +7075,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+)/);
@@ -7162,15 +7173,19 @@ var GitBuffer = class {
       if (conflict.start <= line && conflict.end >= line) {
         switch (part) {
           case 0 /* Current */:
-            await nvim.command(`${conflict.sep},${conflict.end}d`);
-            return nvim.command(`${conflict.start}d`);
+            let start = conflict.common ? conflict.common : conflict.sep;
+            await nvim.command(`${start},${conflict.end}d | ${conflict.start}d`);
+            return;
           case 1 /* Incoming */:
-            await nvim.command(`${conflict.end}d`);
-            return nvim.command(`${conflict.start},${conflict.sep}d`);
+            await nvim.command(`${conflict.end}d | ${conflict.start},${conflict.sep}d`);
+            return;
           case 2 /* Both */:
-            await nvim.command(`${conflict.end}d`);
-            await nvim.command(`${conflict.sep}d`);
-            return nvim.command(`${conflict.start}d`);
+            if (conflict.common) {
+              await nvim.command(`${conflict.end}d | ${conflict.common},${conflict.sep}d | ${conflict.start}d`);
+            } else {
+              await nvim.command(`${conflict.end}d | ${conflict.sep}d | ${conflict.start}d`);
+            }
+            return;
         }
       }
     }
@@ -7250,7 +7265,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;
@@ -7261,7 +7276,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;
@@ -7298,12 +7313,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) {
@@ -7311,11 +7334,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;
@@ -7366,11 +7389,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 startPattern = new RegExp(`^<{7} (${revPattern})(:? .+)?$`);
-    const sepPattern = new RegExp(`^={7}$`);
-    const endPattern = new RegExp(`^>{7} (${revPattern})(:? .+)?$`);
+    const lines = this.doc.textDocument.lines;
     let conflicts = [];
     let conflict = null;
     let state = 0 /* Initial */;
@@ -7391,11 +7410,12 @@ var GitBuffer = class {
           }
           break;
         }
+        case 2 /* MatchedCommon */:
         case 1 /* MatchedStart */: {
-          const match = line.match(sepPattern);
+          let match = line.match(sepPattern);
           if (match) {
             conflict.sep = index + 1;
-            state = 2 /* MatchedSep */;
+            state = 3 /* MatchedSep */;
           } else {
             const startMatch = line.match(startPattern);
             if (startMatch) {
@@ -7404,11 +7424,14 @@ var GitBuffer = class {
             } else if (line.match(endPattern)) {
               conflict = null;
               state = 0 /* Initial */;
+            } else if (line.match(commonPattern)) {
+              conflict.common = index + 1;
+              state = 2 /* MatchedCommon */;
             }
           }
           break;
         }
-        case 2 /* MatchedSep */: {
+        case 3 /* MatchedSep */: {
           const match = line.match(endPattern);
           if (match) {
             conflict.end = index + 1;
@@ -7440,23 +7463,20 @@ var GitBuffer = class {
     let buffer = this.doc.buffer;
     let currentHlGroup = this.config.conflict.currentHlGroup;
     let incomingHlGroup = this.config.conflict.incomingHlGroup;
+    let commonHlGroup = this.config.conflict.commonHlGroup;
     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
-      });
-      for (let line = conflict.start - 1; line < conflict.sep - 1; line++) {
-        buffer.addHighlight({ hlGroup: currentHlGroup, line, srcId });
-      }
-      for (let line = conflict.end - 1; line >= conflict.sep; line--) {
-        buffer.addHighlight({ hlGroup: incomingHlGroup, line, srcId });
+      let currEnd = conflict.common ? conflict.common - 1 : conflict.sep - 1;
+      let currRange = import_coc13.Range.create(import_coc13.Position.create(conflict.start - 1, 0), import_coc13.Position.create(currEnd, 0));
+      let incomingRange = import_coc13.Range.create(import_coc13.Position.create(conflict.sep, 0), import_coc13.Position.create(conflict.end, 0));
+      buffer.highlightRanges(srcId, currentHlGroup, [currRange]);
+      buffer.highlightRanges(srcId, incomingHlGroup, [incomingRange]);
+      if (conflict.common) {
+        let range = import_coc13.Range.create(import_coc13.Position.create(conflict.common - 1, 0), import_coc13.Position.create(conflict.sep - 1, 0));
+        buffer.highlightRanges(srcId, commonHlGroup, [range]);
       }
     });
     nvim.resumeNotification(false, true);
@@ -7521,6 +7541,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"));
@@ -7873,10 +7903,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.2",
+  "version": "2.7.4",
   "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": "",
@@ -415,6 +430,12 @@
           "scope": "application",
           "description": "Highlight group for the incoming version of a merge conflict."
         },
+        "git.conflict.common.hlGroup": {
+          "type": "string",
+          "default": "DiffText",
+          "scope": "application",
+          "description": "Highlight group for the merged common ancestors highlight group."
+        },
         "git.gstatus.saveBeforeOpen": {
           "type": "boolean",
           "default": "false",