coc-git 2.5.3 → 2.5.4

package/Readme.md

@@ -117,6 +117,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`

package/lib/index.js

@@ -6172,7 +6172,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 +6183,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");
@@ -6631,6 +6631,9 @@ var GitBuffer = class {
       this.hasConflicts = hasConflicts;
       this.refresh();
     });
+    this.doc.buffer.getOption("fileencoding").then((encoding) => {
+      this.encoding = encoding;
+    });
   }
   get cachedDiffs() {
     return this.diffs;
@@ -6891,7 +6894,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 = [];

package/package.json

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