coc-git 2.7.3 → 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.
 

package/lib/index.js

@@ -5853,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: {
@@ -6682,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;
@@ -7167,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;
         }
       }
     }
@@ -7347,8 +7357,6 @@ 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 = {
@@ -7381,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 */;
@@ -7406,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) {
@@ -7419,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;
@@ -7455,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -430,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",