Fix: resolve SSH url for git menu (#26)

* Fix: resolve ssh url for git menu

* Remove utm tags for link sharing

* Update to enforce defaultBranch

Author: abeatrix

src/main/java/CommitViewUriBuilder.java

@@ -15,8 +15,12 @@ public URI build(String sourcegraphBase, String revisionNumber, RepoInfo repoInf
     }
 
     // this is pretty hacky but to try to build the repo string we will just try to naively parse the git remote uri. Worst case scenario this 404s
-    URI remote = URI.create(repoInfo.remoteURL);
-    String path = remote.getPath().replace(".git", "");
+    String remoteURL = repoInfo.remoteURL;
+    if(remoteURL.startsWith("git")){
+      remoteURL = repoInfo.remoteURL.replace(".git", "").replaceFirst(":", "/").replace("git@", "https://");;
+    }
+    URI remote = URI.create(remoteURL);
+    String path = remote.getPath();
 
     StringBuilder builder = new StringBuilder();
     try {

src/main/java/Copy.java

@@ -9,12 +9,14 @@ public class Copy extends FileAction {
 
     @Override
     void handleFileUri(String uri) {
+        // Remove utm tags for sharing
+        String shortenURI = uri.replaceAll("(&utm_product_name=)(.*)", "");
         // Copy file uri to clipboard
-        CopyPasteManager.getInstance().setContents(new StringSelection(uri));
+        CopyPasteManager.getInstance().setContents(new StringSelection(shortenURI));
 
         // Display bubble
         Notification notification = new Notification("Sourcegraph", "Sourcegraph",
-                "File URL copied to clipboard.", NotificationType.INFORMATION);
+                "File URL copied to clipboard."+shortenURI, NotificationType.INFORMATION);
         Notifications.Bus.notify(notification);
     }
 }

src/main/java/FileAction.java

@@ -66,12 +66,12 @@ public void actionPerformed(AnActionEvent e) {
                     + "&file=" + URLEncoder.encode(repoInfo.fileRel, "UTF-8")
                     + "&editor=" + URLEncoder.encode("JetBrains", "UTF-8")
                     + "&version=" + URLEncoder.encode(Util.VERSION, "UTF-8")
-                    + "&utm_product_name=" + URLEncoder.encode(productName, "UTF-8")
-                    + "&utm_product_version=" + URLEncoder.encode(productVersion, "UTF-8")
                     + "&start_row=" + URLEncoder.encode(Integer.toString(start.line), "UTF-8")
                     + "&start_col=" + URLEncoder.encode(Integer.toString(start.column), "UTF-8")
                     + "&end_row=" + URLEncoder.encode(Integer.toString(end.line), "UTF-8")
-                    + "&end_col=" + URLEncoder.encode(Integer.toString(end.column), "UTF-8");
+                    + "&end_col=" + URLEncoder.encode(Integer.toString(end.column), "UTF-8")
+                    + "&utm_product_name=" + URLEncoder.encode(productName, "UTF-8")
+                    + "&utm_product_version=" + URLEncoder.encode(productVersion, "UTF-8");
         } catch (UnsupportedEncodingException err) {
             logger.debug("failed to build URL");
             err.printStackTrace();

src/main/java/Util.java

@@ -127,15 +127,15 @@ public static RepoInfo repoInfo(String fileName, Project project) {
             remoteURL = configuredGitRemoteURL(repoRoot);
             branch = Util.setDefaultBranch(project)!=null ? Util.setDefaultBranch(project) : gitBranch(repoRoot);
 
-            // If on a branch that does not exist on the remote or if defaultBranch does not exist on the remote,
+            // If on a branch that does not exist on the remote and no defaultBranch is configured
             // use "master" instead.
-            if (!isRemoteBranch(branch, repoRoot)) {
+            // This allows users to checkout a branch that does not exist in origin remote by setting defaultBranch
+            if (!isRemoteBranch(branch, repoRoot) && Util.setDefaultBranch(project)==null) {
                 branch = "master";
             }
 
             // replace remoteURL if config option is not null
             String r = Util.setRemoteUrlReplacements(project);
-
             if(r!=null) {
                 String[] replacements = r.trim().split("\\s*,\\s*");
                 // Check if the entered values are pairs