coc-git 2.7.1 → 2.7.2

package/lib/index.js

@@ -6763,7 +6763,7 @@ var GitBuffer = class {
     let line = await import_coc13.workspace.nvim.call("line", ".");
     let diff = this.getChunk(line);
     if (!diff) {
-      import_coc13.window.showMessage("Not positioned in git chunk", "error");
+      import_coc13.window.showErrorMessage("Not positioned in git chunk");
       return;
     }
     let head;
@@ -7103,7 +7103,7 @@ var GitBuffer = class {
   async diffCached() {
     let res = await this.repo.safeRun(["diff", "--cached"]);
     if (!res.trim()) {
-      import_coc13.window.showMessage("Empty diff");
+      import_coc13.window.showWarningMessage("Empty diff");
       return;
     }
     let { nvim } = import_coc13.workspace;
@@ -7119,7 +7119,7 @@ var GitBuffer = class {
   async nextConflict() {
     let { nvim } = import_coc13.workspace;
     if (!this.conflicts.length) {
-      import_coc13.window.showMessage("No conflicts detected", "warning");
+      import_coc13.window.showWarningMessage("No conflicts detected");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7136,7 +7136,7 @@ var GitBuffer = class {
   async prevConflict() {
     let { nvim } = import_coc13.workspace;
     if (!this.conflicts.length) {
-      import_coc13.window.showMessage("No conflicts detected", "warning");
+      import_coc13.window.showWarningMessage("No conflicts detected", "warning");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7154,7 +7154,7 @@ var GitBuffer = class {
     const { nvim } = import_coc13.workspace;
     let conflicts = this.conflicts;
     if (!conflicts || conflicts.length == 0) {
-      import_coc13.window.showMessage("No conflicts detected");
+      import_coc13.window.showWarningMessage("No conflicts detected");
       return;
     }
     let line = await nvim.call("line", ".");
@@ -7174,7 +7174,7 @@ var GitBuffer = class {
         }
       }
     }
-    import_coc13.window.showMessage("Not positioned on a conflict");
+    import_coc13.window.showWarningMessage("Not positioned on a conflict");
   }
   async browser(action = "open", range, permalink = false) {
     let { nvim } = import_coc13.workspace;
@@ -7197,7 +7197,7 @@ var GitBuffer = class {
     }
     let output = await this.repo.safeRun(["remote"]);
     if (!output.trim()) {
-      import_coc13.window.showMessage(`No remote found`, "warning");
+      import_coc13.window.showWarningMessage(`No remote found`);
       return;
     }
     let names = output.trim().split(/\r?\n/);
@@ -7206,7 +7206,7 @@ var GitBuffer = class {
       if (names.includes(browserRemoteName)) {
         names = [browserRemoteName];
       } else {
-        import_coc13.window.showMessage("Configured git.browserRemoteName missing from remote list", "warning");
+        import_coc13.window.showWarningMessage("Configured git.browserRemoteName missing from remote list");
         return;
       }
     }
@@ -7231,16 +7231,17 @@ var GitBuffer = class {
         await import_coc13.workspace.openResource(urls[0]);
       } else {
         nvim.command(`let @+ = '${urls[0]}'`, true);
-        import_coc13.window.showMessage("Copied url to clipboard");
+        import_coc13.window.showInformationMessage("Copied url to clipboard");
       }
     } else if (urls.length > 1) {
-      let idx = await import_coc13.window.showQuickpick(urls, "Select url:");
-      if (idx >= 0) {
+      let url = await import_coc13.window.showQuickPick(urls, { canPickMany: false, title: "Pick remote url" });
+      if (url) {
         if (action == "open") {
-          await import_coc13.workspace.openResource(urls[idx]);
+          await import_coc13.workspace.openResource(url);
         } else {
-          nvim.command(`let @+ = '${urls[idx]}'`, true);
-          import_coc13.window.showMessage("Copied url to clipboard");
+          nvim.command(`let @+ = '${url}'`, true);
+          nvim.command(`let @* = '${url}'`, true);
+          import_coc13.window.showInformationMessage("Copied url to clipboard");
         }
       }
     }
@@ -7366,7 +7367,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 revPattern = "([0-9A-Za-z_.:/-]+)";
     const startPattern = new RegExp(`^<{7} (${revPattern})(:? .+)?$`);
     const sepPattern = new RegExp(`^={7}$`);
     const endPattern = new RegExp(`^>{7} (${revPattern})(:? .+)?$`);
@@ -7442,19 +7443,20 @@ var GitBuffer = class {
     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: this.config.conflictSrcId
+        srcId
       });
       for (let line = conflict.start - 1; line < conflict.sep - 1; line++) {
-        buffer.addHighlight({ hlGroup: currentHlGroup, line, srcId: this.config.conflictSrcId });
+        buffer.addHighlight({ hlGroup: currentHlGroup, line, srcId });
       }
       for (let line = conflict.end - 1; line >= conflict.sep; line--) {
-        buffer.addHighlight({ hlGroup: incomingHlGroup, line, srcId: this.config.conflictSrcId });
+        buffer.addHighlight({ hlGroup: incomingHlGroup, line, srcId });
       }
     });
     nvim.resumeNotification(false, true);

package/package.json

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