coc-git 2.4.9 → 2.4.10

package/Readme.md

@@ -61,8 +61,6 @@ In your vim/neovim, run command:
 
 - `git.browserBranchName`: Branch name for browserOpen and copyUrl., default: `""`
 
-- `git.urlMode`: URL mode for browserOpen and copyUrl, you can set it to `"permalink"`. default: `"normal"`
-
 - `git.urlFix`: a object to configure the url style of copyUrl and browserOpen, make this two command support other git services like gitlab and gitea. default: `{}`
 
 - `git.issueFormat`: Formatting string for issue completion. Supported interpolation variables: %i - issue id. %r - repository name. %o - organization/owner name. %t - issue title. %b - issue body. %c - issue created at. %a - issue author. %u - issue url., default: `"#%i"`

package/lib/index.js

@@ -4924,20 +4924,19 @@ var Bcommits = class extends import_coc2.BasicList {
     }, {tabPersist: true});
     this.addAction("view", async (item, context) => {
       let {commit, root, file} = item.data;
-      let {window: window9, listWindow} = context;
+      let {window: window9} = context;
       let content = await import_coc2.runCommand(`git show ${commit}:${shellescape(file)}`, {cwd: root});
       let lines = content.replace(/\n$/, "").split("\n");
       nvim.pauseNotification();
       nvim.call("win_gotoid", [window9.id], true);
-      nvim.command(`exe "edit ".fnameescape('(${commit}) ${file}')`, true);
+      nvim.command(`exe "tabe ".fnameescape('(${commit}) ${file}')`, true);
       nvim.call("append", [0, lines], true);
       nvim.command("normal! Gdd", true);
       nvim.command(`exe 1`, true);
       nvim.command("setl buftype=nofile nomodifiable bufhidden=wipe nobuflisted", true);
       nvim.command("filetype detect", true);
-      nvim.call("win_gotoid", [listWindow.id], true);
       await nvim.resumeNotification();
-    }, {persist: true});
+    }, {persist: false});
     this.addAction("diff", async (item, context) => {
       let buffer = await context.window.buffer;
       let filetype = await buffer.getOption("filetype");
@@ -5880,10 +5879,10 @@ var DocumentManager = class {
     if (buf)
       await buf.showCommit();
   }
-  async browser(action = "open", range) {
+  async browser(action = "open", range, permalink = false) {
     let buf = await this.buffer;
     if (buf)
-      await buf.browser(action, range);
+      await buf.browser(action, range, permalink);
   }
   async diffCached() {
     let buf = await this.buffer;
@@ -6984,10 +6983,9 @@ var GitBuffer = class {
     }
     import_coc11.window.showMessage("Not positioned on a conflict");
   }
-  async browser(action = "open", range) {
+  async browser(action = "open", range, permalink = false) {
     let {nvim} = import_coc11.workspace;
     let config = import_coc11.workspace.getConfiguration("git");
-    let mode = config.get("urlMode", "normal").trim();
     let head = (await this.repo.safeRun(["rev-parse", "HEAD"])).trim();
     let branch = config.get("browserBranchName", "").trim();
     if (!branch.length) {
@@ -7029,16 +7027,16 @@ var GitBuffer = class {
       let hostname = tmp.hostname;
       let fix = "|";
       try {
-        fix = config.get("urlFix")[hostname][mode == "permalink" ? 1 : 0];
+        fix = config.get("urlFix")[hostname][permalink ? 1 : 0];
       } catch (e) {
       }
-      let url = getUrl(fix, repoURL, mode == "permalink" ? head : branch, this.relpath.replace(/\\\\/g, "/"), lines);
+      let url = getUrl(fix, repoURL, permalink ? head : branch, this.relpath.replace(/\\\\/g, "/"), lines);
       if (url)
         urls.push(url);
     }
     if (urls.length == 1) {
       if (action == "open") {
-        nvim.call("coc#util#open_url", [urls[0]], true);
+        await import_coc11.workspace.openResource(urls[0]);
       } else {
         nvim.command(`let @+ = '${urls[0]}'`, true);
         import_coc11.window.showMessage("Copied url to clipboard");
@@ -7047,7 +7045,7 @@ var GitBuffer = class {
       let idx = await import_coc11.window.showQuickpick(urls, "Select url:");
       if (idx >= 0) {
         if (action == "open") {
-          nvim.call("coc#util#open_url", [urls[idx]], true);
+          await import_coc11.workspace.openResource(urls[idx]);
         } else {
           nvim.command(`let @+ = '${urls[idx]}'`, true);
           import_coc11.window.showMessage("Copied url to clipboard");
@@ -7764,6 +7762,9 @@ async function activate(context) {
   subscriptions.push(import_coc14.commands.registerCommand("git.copyUrl", async (...args) => {
     await manager.browser("copy", args);
   }));
+  subscriptions.push(import_coc14.commands.registerCommand("git.copyPermalink", async (...args) => {
+    await manager.browser("copy", args, true);
+  }));
   subscriptions.push(import_coc14.commands.registerCommand("git.push", async (...args) => {
     await manager.push(args);
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-git",
-  "version": "2.4.9",
+  "version": "2.4.10",
   "description": "Git extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "chemzqm",
@@ -55,6 +55,10 @@
         "title": "Copy url of current line to clipboard, github url supported.",
         "command": "git.copyUrl"
       },
+      {
+        "title": "Copy permalink of current line to clipboard, github url supported.",
+        "command": "git.copyPermalink"
+      },
       {
         "title": "Show cached diff in preview window.",
         "command": "git.diffCached"
@@ -95,14 +99,6 @@
           "default": "",
           "description": "Branch name for browserOpen and copyUrl."
         },
-        "git.urlMode": {
-          "type": "string",
-          "default": "normal",
-          "enum": [
-            "normal",
-            "permalink"
-          ]
-        },
         "git.urlFix": {
           "type": "object",
           "default": {},