coc-git 2.5.3 → 2.6.0

package/Readme.md

@@ -6,13 +6,6 @@ Git integration of [coc.nvim](https://github.com/neoclide/coc.nvim).
 use plugin like [vim-fugitive](https://github.com/tpope/vim-fugitive) at the
 same time.
 
-## Supporting
-
-If you like my extension, consider supporting me on Patreon or PayPal:
-
-<a href="https://www.patreon.com/chemzqm"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /> </a>
-<a href="https://www.paypal.com/paypalme/chezqm"><img src="https://werwolv.net/assets/paypal_banner.png" alt="PayPal donate button" /> </a>
-
 ## Install
 
 In your vim/neovim, run command:
@@ -117,6 +110,8 @@ In your vim/neovim, run command:
 
 - `git.showCommitInFloating`: Show commit in floating or popup window, default: `false`
 
+- `git.floatConfig`: Configure style of float window/popup, extends from floatFactory.floatConfig
+
 - `git.gitlab.hosts`: Custom GitLab hosts, default: `["gitlab.com"]`
 
 - `git.conflict.enabled`: Enable highlight conflict lines, default: `true`
@@ -263,7 +258,14 @@ Multiple repositories can be specified using comma separation, like this: `githu
 
 Q: Virtual text not working.
 
-A: Make sure your neovim support virtual text by command `:echo exists('*nvim_buf_set_virtual_text')`.
+A: Make sure your neovim/vim support virtual text by command `:echo has('nvim-0.5.0') || has('patch-9.0.0067')`.
+
+## Supporting
+
+If you like my extension, consider supporting me on Patreon or PayPal:
+
+<a href="https://www.patreon.com/chemzqm"><img src="https://c5.patreon.com/external/logo/become_a_patron_button.png" alt="Patreon donate button" /> </a>
+<a href="https://www.paypal.com/paypalme/chezqm"><img src="https://werwolv.net/assets/paypal_banner.png" alt="PayPal donate button" /> </a>
 
 ## License
 

package/lib/index.js

@@ -936,107 +936,6 @@ var require_debounce = __commonJS((exports2, module2) => {
   module2.exports = debounce3;
 });
 
-// node_modules/uuid/deprecate.js
-var require_deprecate = __commonJS((exports2, module2) => {
-  var deprecate;
-  try {
-    const util2 = require("util");
-    deprecate = util2.deprecate;
-  } catch (err) {
-    deprecate = function deprecate2(fn, msg) {
-      var warned = false;
-      function deprecated() {
-        if (!warned) {
-          console.warn(msg);
-          warned = true;
-        }
-        return fn.apply(this, arguments);
-      }
-      return deprecated;
-    };
-  }
-  module2.exports = deprecate;
-});
-
-// node_modules/uuid/dist/rng.js
-var require_rng = __commonJS((exports2, module2) => {
-  "use strict";
-  Object.defineProperty(exports2, "__esModule", {
-    value: true
-  });
-  exports2.default = rng;
-  var _crypto = _interopRequireDefault(require("crypto"));
-  function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {default: obj};
-  }
-  function rng() {
-    return _crypto.default.randomBytes(16);
-  }
-  module2.exports = exports2.default;
-});
-
-// node_modules/uuid/dist/bytesToUuid.js
-var require_bytesToUuid = __commonJS((exports2, module2) => {
-  "use strict";
-  Object.defineProperty(exports2, "__esModule", {
-    value: true
-  });
-  exports2.default = void 0;
-  var byteToHex = [];
-  for (var i = 0; i < 256; ++i) {
-    byteToHex[i] = (i + 256).toString(16).substr(1);
-  }
-  function bytesToUuid(buf, offset) {
-    var i2 = offset || 0;
-    var bth = byteToHex;
-    return [bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]], "-", bth[buf[i2++]], bth[buf[i2++]], "-", bth[buf[i2++]], bth[buf[i2++]], "-", bth[buf[i2++]], bth[buf[i2++]], "-", bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]], bth[buf[i2++]]].join("");
-  }
-  var _default = bytesToUuid;
-  exports2.default = _default;
-  module2.exports = exports2.default;
-});
-
-// node_modules/uuid/dist/v4.js
-var require_v4 = __commonJS((exports2, module2) => {
-  "use strict";
-  Object.defineProperty(exports2, "__esModule", {
-    value: true
-  });
-  exports2.default = void 0;
-  var _rng = _interopRequireDefault(require_rng());
-  var _bytesToUuid = _interopRequireDefault(require_bytesToUuid());
-  function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {default: obj};
-  }
-  function v4(options, buf, offset) {
-    var i = buf && offset || 0;
-    if (typeof options == "string") {
-      buf = options === "binary" ? new Array(16) : null;
-      options = null;
-    }
-    options = options || {};
-    var rnds = options.random || (options.rng || _rng.default)();
-    rnds[6] = rnds[6] & 15 | 64;
-    rnds[8] = rnds[8] & 63 | 128;
-    if (buf) {
-      for (var ii = 0; ii < 16; ++ii) {
-        buf[i + ii] = rnds[ii];
-      }
-    }
-    return buf || (0, _bytesToUuid.default)(rnds);
-  }
-  var _default = v4;
-  exports2.default = _default;
-  module2.exports = exports2.default;
-});
-
-// node_modules/uuid/v4.js
-var require_v42 = __commonJS((exports2, module2) => {
-  var deprecate = require_deprecate();
-  var v4 = require_v4();
-  module2.exports = deprecate(v4, "Deep requiring like `const uuidv4 = require('uuid/v4');` is deprecated as of uuid@7.x. Please require the top-level module when using the Node.js CommonJS module or use ECMAScript Modules when bundling for the browser. See https://github.com/uuidjs/uuid#deep-requires-now-deprecated for more information.");
-});
-
 // node_modules/safer-buffer/safer.js
 var require_safer = __commonJS((exports2, module2) => {
   "use strict";
@@ -5814,7 +5713,7 @@ var DocumentManager = class {
       diffRevision: config.get("diffRevision", ""),
       issueFormat: config.get("issueFormat", "#%i"),
       virtualTextPrefix: config.get("virtualTextPrefix", "     "),
-      addGBlameToVirtualText: import_coc9.workspace.nvim.hasFunction("nvim_buf_set_virtual_text") && config.get("addGBlameToVirtualText", false),
+      addGBlameToVirtualText: config.get("addGBlameToVirtualText", false),
       addGBlameToBufferVar: config.get("addGBlameToBufferVar", false),
       blameUseRealTime: config.get("blameUseRealTime", false),
       enableGutters: config.get("enableGutters", true),
@@ -6038,7 +5937,46 @@ var import_fs2 = __toModule(require("fs"));
 var import_os = __toModule(require("os"));
 var import_path4 = __toModule(require("path"));
 var import_util6 = __toModule(require("util"));
-var uuid = require_v42();
+
+// node_modules/uuid/dist/esm-node/rng.js
+var import_crypto = __toModule(require("crypto"));
+function rng() {
+  return import_crypto.default.randomBytes(16);
+}
+
+// node_modules/uuid/dist/esm-node/bytesToUuid.js
+var byteToHex = [];
+for (var i = 0; i < 256; ++i) {
+  byteToHex[i] = (i + 256).toString(16).substr(1);
+}
+function bytesToUuid(buf, offset) {
+  var i = offset || 0;
+  var bth = byteToHex;
+  return [bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], "-", bth[buf[i++]], bth[buf[i++]], "-", bth[buf[i++]], bth[buf[i++]], "-", bth[buf[i++]], bth[buf[i++]], "-", bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]], bth[buf[i++]]].join("");
+}
+var bytesToUuid_default = bytesToUuid;
+
+// node_modules/uuid/dist/esm-node/v4.js
+function v4(options, buf, offset) {
+  var i = buf && offset || 0;
+  if (typeof options == "string") {
+    buf = options === "binary" ? new Array(16) : null;
+    options = null;
+  }
+  options = options || {};
+  var rnds = options.random || (options.rng || rng)();
+  rnds[6] = rnds[6] & 15 | 64;
+  rnds[8] = rnds[8] & 63 | 128;
+  if (buf) {
+    for (var ii = 0; ii < 16; ++ii) {
+      buf[i + ii] = rnds[ii];
+    }
+  }
+  return buf || bytesToUuid_default(rnds);
+}
+var v4_default = v4;
+
+// src/model/repo.ts
 var Repo = class {
   constructor(git, channel, root) {
     this.git = git;
@@ -6172,7 +6110,7 @@ var Repo = class {
       return "";
     }
   }
-  async getDiff(relFilepath, content, revision = "") {
+  async getDiff(relFilepath, content, revision = "", encoding = "utf8") {
     if (relFilepath.startsWith(`.git${import_path4.default.sep}`))
       return;
     let fullpath = import_path4.default.join(this.root, relFilepath);
@@ -6183,7 +6121,7 @@ var Repo = class {
       let indexed = await this.isIndexed(relFilepath);
       if (!indexed)
         return;
-      let res = await this.exec(["--no-pager", "show", `${revision}:${toUnixSlash(relFilepath)}`]);
+      let res = await this.exec(["--no-pager", "show", `${revision}:${toUnixSlash(relFilepath)}`], {encoding});
       if (!res.stdout)
         return;
       staged = res.stdout.replace(/\r?\n$/, "").split(/\r?\n/).join("\n");
@@ -6191,8 +6129,8 @@ var Repo = class {
       this.channel.append(e.stack);
       return;
     }
-    const stagedFile = import_path4.default.join(import_os.default.tmpdir(), `coc-${uuid()}`);
-    const currentFile = import_path4.default.join(import_os.default.tmpdir(), `coc-${uuid()}`);
+    const stagedFile = import_path4.default.join(import_os.default.tmpdir(), `coc-${v4_default()}`);
+    const currentFile = import_path4.default.join(import_os.default.tmpdir(), `coc-${v4_default()}`);
     await import_util6.default.promisify(import_fs2.default.writeFile)(stagedFile, staged + "\n", "utf8");
     await import_util6.default.promisify(import_fs2.default.writeFile)(currentFile, content, "utf8");
     let output = await getStdout(`git --no-pager diff --no-ext-diff -p -U0 --no-color ${shellescape(stagedFile)} ${shellescape(currentFile)}`);
@@ -6631,6 +6569,9 @@ var GitBuffer = class {
       this.hasConflicts = hasConflicts;
       this.refresh();
     });
+    this.doc.buffer.getOption("fileencoding").then((encoding) => {
+      this.encoding = encoding;
+    });
   }
   get cachedDiffs() {
     return this.diffs;
@@ -6819,7 +6760,7 @@ var GitBuffer = class {
       line = line + adjust;
       let chunk = chunks.find((o) => o.add.lnum <= line && o.add.lnum + o.add.count >= line);
       if (chunk) {
-        let content = "Staged chagnes\n" + chunk.lines.join("\n");
+        let content = "Staged changes\n" + chunk.lines.join("\n");
         await this.showDoc(content, "diff");
       }
     }
@@ -6846,7 +6787,7 @@ var GitBuffer = class {
     let buffer = nvim.createBuffer(this.doc.bufnr);
     let hide_blame = await nvim.getVar("coc_git_hide_blame_virtual_text");
     if (hide_blame) {
-      await buffer.request("nvim_buf_clear_namespace", [virtualTextSrcId, 0, -1]);
+      await buffer.clearNamespace(virtualTextSrcId);
     } else {
       if (addGBlameToBufferVar) {
         nvim.pauseNotification();
@@ -6856,15 +6797,10 @@ var GitBuffer = class {
       }
       if (addGBlameToVirtualText) {
         const prefix = this.config.virtualTextPrefix;
-        await buffer.clearNamespace(virtualTextSrcId);
-        if (import_coc12.workspace.has("nvim-0.6.0")) {
-          await buffer.setExtMark(virtualTextSrcId, lnum - 1, 0, {
-            hl_mode: "combine",
-            virt_text: [[prefix + blameText, "CocCodeLens"]]
-          });
-        } else {
-          await buffer.setVirtualText(virtualTextSrcId, lnum - 1, [[prefix + blameText, "CocCodeLens"]]);
-        }
+        nvim.pauseNotification();
+        buffer.clearNamespace(virtualTextSrcId);
+        buffer.setVirtualText(virtualTextSrcId, lnum - 1, [[prefix + blameText, "CocCodeLens"]]);
+        nvim.resumeNotification(true, true);
       }
     }
   }
@@ -6891,7 +6827,9 @@ var GitBuffer = class {
     let {nvim} = import_coc12.workspace;
     let revision = this.config.diffRevision;
     const {bufnr} = this.doc;
-    const diffs = await this.repo.getDiff(this.relpath, this.doc.content, revision);
+    let content = this.doc.content;
+    let eol = this.doc.textDocument["eol"];
+    const diffs = await this.repo.getDiff(this.relpath, eol ? content : content + "\n", revision, this.encoding || "utf8");
     if (diffs == null) {
       if (((_a = this.currentSigns) == null ? void 0 : _a.length) > 0) {
         this.currentSigns = [];
@@ -7451,7 +7389,7 @@ var GitBuffer = class {
       buffer.setVar("coc_git_blame", "", true);
     }
     if (this.config.addGBlameToVirtualText) {
-      buffer.notify("nvim_buf_clear_namespace", [this.config.virtualTextSrcId, 0, -1]);
+      buffer.clearNamespace(this.config.virtualTextSrcId);
     }
     nvim.resumeNotification(false, true);
     this._disposed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.5.3",
+  "version": "2.6.0",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -9,7 +9,7 @@
     "git"
   ],
   "engines": {
-    "coc": "^0.0.80"
+    "coc": "^0.0.82"
   },
   "repository": {
     "type": "git",
@@ -138,12 +138,12 @@
         "git.virtualTextPrefix": {
           "type": "string",
           "default": "     ",
-          "description": "Prefix of git blame infomation to virtual text, require virtual text feature of neovim."
+          "description": "Prefix of git blame information to virtual text, require virtual text feature of vim/neovim."
         },
         "git.addGBlameToVirtualText": {
           "type": "boolean",
           "default": false,
-          "description": "Add git blame information to virtual text, require virtual text feature of neovim."
+          "description": "Add git blame information to virtual text, require virtual text feature of vim/neovim."
         },
         "git.addGBlameToBufferVar": {
           "type": "boolean",
@@ -427,7 +427,7 @@
     "@types/node": "^12.12.0",
     "@types/uuid": "^7.0.1",
     "@types/which": "^1.3.2",
-    "coc.nvim": "^0.0.83-next.2",
+    "coc.nvim": "^0.0.83-next.14",
     "colors": "^1.4.0",
     "debounce": "^1.2.0",
     "esbuild": "^0.8.29",