coc-git 2.4.5 → 2.4.8

package/lib/index.js

@@ -4862,7 +4862,6 @@ var Bcommits = class extends import_coc2.BasicList {
     this.name = "bcommits";
     this.description = "Commits of current file.";
     this.defaultAction = "show";
-    this.actions = [];
     this.addAction("preview", async (item, context) => {
       let {commit, root} = item.data;
       let lines = [];
@@ -4877,18 +4876,20 @@ var Bcommits = class extends import_coc2.BasicList {
         bufname: commit ? `[commit ${commit}]` : ""
       }, context);
     });
-    this.addAction("show", async (item) => {
+    this.addAction("show", async (item, ctx) => {
       let {commit, root} = item.data;
       if (!commit)
         return;
       let hasFugitive = await nvim.getVar("loaded_fugitive");
       if (hasFugitive) {
-        await nvim.command(`Gedit ${commit}`);
+        let cmd = ctx.options.position === "tab" ? "Gtabedit" : "Gedit";
+        await nvim.command(`${cmd} ${commit}`);
       } else {
+        let cmd = ctx.options.position === "tab" ? "tabe" : "edit";
         let content = await import_coc2.runCommand(`git --no-pager show ${commit}`, {cwd: root});
         let lines = content.trim().split("\n");
         nvim.pauseNotification();
-        nvim.command(`edit +setl\\ buftype=nofile [commit ${commit}]`, true);
+        nvim.command(`${cmd} +setl\\ buftype=nofile [commit ${commit}]`, true);
         nvim.command("setl foldmethod=syntax nobuflisted bufhidden=wipe", true);
         nvim.command("setf git", true);
         nvim.call("append", [0, lines], true);
@@ -4896,7 +4897,7 @@ var Bcommits = class extends import_coc2.BasicList {
         nvim.command(`exe 1`, true);
         await nvim.resumeNotification();
       }
-    });
+    }, {tabPersist: true});
     this.addAction("view", async (item, context) => {
       let {commit, root, file} = item.data;
       let {window: window9, listWindow} = context;
@@ -5129,7 +5130,6 @@ var Commits = class extends import_coc4.BasicList {
     this.name = "commits";
     this.description = "Commits of current project.";
     this.defaultAction = "show";
-    this.actions = [];
     this.cachedCommits = new Map();
     this.addAction("preview", async (item, context) => {
       let {commit, root} = item.data;
@@ -5151,13 +5151,14 @@ var Commits = class extends import_coc4.BasicList {
         bufname: commit ? `[commit ${commit}]` : ""
       }, context);
     });
-    this.addAction("show", async (item) => {
+    this.addAction("show", async (item, ctx) => {
       let {commit, root} = item.data;
       if (!commit)
         return;
       let hasFugitive = await nvim.getVar("loaded_fugitive");
       if (hasFugitive) {
-        await nvim.command(`Gedit ${commit}`);
+        let cmd = ctx.options.position === "tab" ? "Gtabedit" : "Gedit";
+        await nvim.command(`${cmd} ${commit}`);
       } else {
         let lines = this.cachedCommits.get(commit);
         if (!lines) {
@@ -5167,8 +5168,9 @@ var Commits = class extends import_coc4.BasicList {
           lines = content.replace(/\n$/, "").split(/\r?\n/);
           this.cachedCommits.set(commit, lines);
         }
+        let cmd = ctx.options.position === "tab" ? "tabe" : "edit";
         nvim.pauseNotification();
-        nvim.command(`edit +setl\\ buftype=nofile [commit ${commit}]`, true);
+        nvim.command(`${cmd} +setl\\ buftype=nofile [commit ${commit}]`, true);
         nvim.command("setl foldmethod=syntax nobuflisted bufhidden=wipe", true);
         nvim.command("setf git", true);
         nvim.call("append", [0, lines], true);
@@ -5176,7 +5178,7 @@ var Commits = class extends import_coc4.BasicList {
         nvim.command(`exe 1`, true);
         await nvim.resumeNotification();
       }
-    });
+    }, {tabPersist: true});
     this.addAction("reset", async (item) => {
       let {root, commit} = item.data;
       if (!commit)
@@ -5251,7 +5253,7 @@ var Commits = class extends import_coc4.BasicList {
       let content = await runCommand(`git --no-pager diff ${arg}`, {cwd: list[0].data.root});
       let lines = content.replace(/\n$/, "").split("\n");
       let winid = context.listWindow.id;
-      let mod = context.options.position == "top" ? "below" : "above";
+      let mod = context.options.position == "tab" ? "below" : "above";
       nvim.pauseNotification();
       nvim.command("pclose", true);
       nvim.command(`${mod} ${this.previewHeight}sp +setl\\ previewwindow [diff ${arg}]`, true);
@@ -5315,12 +5317,14 @@ var Gfiles = class extends import_coc5.BasicList {
     const preferences = import_coc5.workspace.getConfiguration("coc.preferences");
     let jumpCommand = preferences.get("jumpCommand", "edit");
     for (let name of ["edit", "tabe", "vsplit", "split"]) {
-      this.addAction(name, async (item) => {
+      this.addAction(name, async (item, ctx) => {
         let {root, sha, filepath, branch} = item.data;
         if (!sha)
           return;
         if (branch == "HEAD") {
           let cmd2 = name == "edit" ? jumpCommand : name;
+          if (ctx.options.position === "tab")
+            cmd2 = "tabe";
           let fullpath = import_path2.default.join(root, filepath);
           await import_coc5.workspace.jumpTo(import_coc5.Uri.file(fullpath).toString(), null, cmd2);
           return;
@@ -5336,7 +5340,7 @@ var Gfiles = class extends import_coc5.BasicList {
         nvim.command("setl buftype=nofile nomodifiable bufhidden=wipe nobuflisted", true);
         nvim.command("filetype detect", true);
         await nvim.resumeNotification();
-      });
+      }, {tabPersist: name === "edit"});
     }
     this.addAction("preview", async (item, context) => {
       let {root, sha, filepath, branch} = item.data;
@@ -5406,7 +5410,6 @@ var GStatus = class extends import_coc6.BasicList {
     this.name = "gstatus";
     this.description = "Git status of current project";
     this.defaultAction = "open";
-    this.actions = [];
     this.addLocationActions();
     this.addMultipleAction("add", async (items) => {
       let {root} = items[0].data;
@@ -5631,28 +5634,26 @@ var DocumentManager = class {
     this.conflictSrcId = conflictSrcId;
     this.buffers = new Map();
     this.disposables = [];
+    this.defined = false;
     this.loadConfiguration();
     import_coc8.workspace.onDidChangeConfiguration(this.loadConfiguration, this, this.disposables);
     this.gitStatus = new status_default(service);
-    if (this.enableGutters) {
-      this.defineSigns().catch((e) => {
-        console.error(e.message);
-      });
-    }
-    for (let doc of import_coc8.workspace.documents) {
+    const createBuffer = (doc) => {
       let {uri} = doc;
       service.createBuffer(doc, this.config).then((buf) => {
         if (!buf || import_coc8.workspace.getDocument(uri) == null)
           return;
+        this.defineSigns().catch((e) => {
+          console.error(e.message);
+        });
         this.buffers.set(doc.bufnr, buf);
       });
+    };
+    for (let doc of import_coc8.workspace.documents) {
+      createBuffer(doc);
     }
     import_coc8.workspace.onDidOpenTextDocument(async (e) => {
-      let doc = import_coc8.workspace.getDocument(e.bufnr);
-      let buf = await service.createBuffer(doc, this.config);
-      if (!buf || !import_coc8.workspace.getDocument(e.uri))
-        return;
-      this.buffers.set(e.bufnr, buf);
+      createBuffer(import_coc8.workspace.getDocument(e.bufnr));
     }, null, this.disposables);
     import_coc8.workspace.onDidChangeTextDocument(async (e) => {
       let buf = this.buffers.get(e.bufnr);
@@ -5691,6 +5692,9 @@ var DocumentManager = class {
     }, null, this.disposables);
   }
   async defineSigns() {
+    if (!this.enableGutters || this.defined)
+      return;
+    this.defined = true;
     let {nvim} = this;
     const config = import_coc8.workspace.getConfiguration("git");
     let items = ["Changed", "Added", "Removed", "TopRemoved", "ChangeRemoved"];
@@ -5700,7 +5704,7 @@ var DocumentManager = class {
       let text = config.get(`${section}.text`, "");
       let hlGroup = config.get(`${section}.hlGroup`, "");
       nvim.command(`sign define CocGit${item} text=${text} texthl=CocGit${item}Sign`, true);
-      nvim.command(`hi default link CocGit${item}Sign ${hlGroup}`, true);
+      nvim.command(`highlight default link CocGit${item}Sign ${hlGroup}`, true);
     }
     await nvim.resumeNotification();
   }
@@ -6629,6 +6633,7 @@ var GitBuffer = class {
         await buffer.clearNamespace(virtualTextSrcId);
         if (import_coc11.workspace.has("nvim-0.6.0")) {
           await buffer.setExtMark(virtualTextSrcId, lnum - 1, 0, {
+            hl_mode: "combine",
             virt_text: [[prefix + blameText, "CocCodeLens"]]
           });
         } else {
@@ -7405,7 +7410,6 @@ function addSource(context, resolver) {
       page_idx++;
       try {
         let info = await import_coc13.fetch(page_uri, {headers});
-        console.log(JSON.stringify(info, null, 2));
         if (info.length == 0) {
           break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.4.5",
+  "version": "2.4.8",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -355,7 +355,7 @@
     "@types/node": "^12.12.0",
     "@types/uuid": "^7.0.1",
     "@types/which": "^1.3.2",
-    "coc.nvim": "^0.0.81-next.9",
+    "coc.nvim": "^0.0.81-next.13",
     "colors": "^1.4.0",
     "debounce": "^1.2.0",
     "esbuild": "^0.8.29",