Merge pull request #8 from xadamxk/release/1.0.1

Release/1.0.1
xadamxk · Jan 30, 2024 · b79f1f6 · b79f1f6
2 parents 4cbc73e + db0188f
commit b79f1f6
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "open-git-repository",
   "displayName": "Open Git Repository",
   "description": "Open git repository links in your browser (GitHub, BitBucket, GitLab, SourceForge, and more!)",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "license": "MIT",
   "icon": "images/octoogre-200.png",
   "publisher": "xadamxk",

diff --git a/src/commands/openFile.ts b/src/commands/openFile.ts
@@ -1,9 +1,10 @@
 import * as vscode from "vscode";
 import { Commands, EXTENSION_NAME } from "../constants";
-import { getBranchName, getRemoteOriginUrl } from "../core/git";
+import { getBranchName, getRemoteOrigin } from "../core/git";
 import { GitHubProvider } from "../providers/GitHub";
 import { Providers } from "../providers/util";
 import { GitLabProvider } from "../providers/GitLab";
+import { formatRemoteOriginalUrl } from "../core/utils";
 
 export const openFileCommand = (): vscode.Disposable => {
   return vscode.commands.registerCommand(
@@ -13,9 +14,8 @@ export const openFileCommand = (): vscode.Disposable => {
         const workSpaceUri = vscode.workspace.workspaceFolders[0].uri;
         const workSpaceFileSystemPath = workSpaceUri.fsPath;
         const projectPath = workSpaceUri.path;
-        const remoteOriginUrl = await getRemoteOriginUrl(
-          workSpaceFileSystemPath
-        );
+        const remoteOrigin = await getRemoteOrigin(workSpaceFileSystemPath);
+        const remoteOriginUrl = formatRemoteOriginalUrl(remoteOrigin);
         if (remoteOriginUrl) {
           const currentBranchName = await getBranchName(
             workSpaceFileSystemPath

diff --git a/src/commands/openRepository.ts b/src/commands/openRepository.ts
@@ -1,7 +1,8 @@
 import * as vscode from "vscode";
 import { Commands, EXTENSION_NAME } from "../constants";
-import { getRemoteOriginUrl } from "../core/git";
+import { getRemoteOrigin } from "../core/git";
 import { formatUrl } from "../providers/util";
+import { formatRemoteOriginalUrl } from "../core/utils";
 
 export const openRepositoryCommand = (): vscode.Disposable => {
   return vscode.commands.registerCommand(Commands.OPEN_REPOSITORY, async () => {
@@ -11,7 +12,8 @@ export const openRepositoryCommand = (): vscode.Disposable => {
       //    var currentlyOpenTabfileName = path.basename(currentlyOpenTabfilePath);
       const folderPath = vscode.workspace.workspaceFolders[0].uri.fsPath;
 
-      const remoteOriginUrl = await getRemoteOriginUrl(folderPath);
+      const remoteOrigin = await getRemoteOrigin(folderPath);
+      const remoteOriginUrl = formatRemoteOriginalUrl(remoteOrigin);
       if (remoteOriginUrl) {
         vscode.env.openExternal(vscode.Uri.parse(formatUrl(remoteOriginUrl)));
       } else {

diff --git a/src/core/configuration.ts b/src/core/configuration.ts
@@ -26,6 +26,7 @@ const IconMap = {
  * Configuration keys for the extension - must match the keys in package.json
  */
 export const ExtensionConfiguration = {
+  StatusBarEnabled: "statusBar.enabled",
   StatusBarIcon: "statusBar.icon",
   StatusBarAlignment: "statusBar.alignment",
 };

diff --git a/src/core/git.ts b/src/core/git.ts
@@ -14,7 +14,7 @@ const buildGitOptions = (path: string): Partial<SimpleGitOptions> => {
   };
 };
 
-export const getRemoteOriginUrl = (baseDirectory: string): Promise<string> => {
+export const getRemoteOrigin = (baseDirectory: string): Promise<string> => {
   return simpleGit(buildGitOptions(baseDirectory))
     .getRemotes(true)
     .then((remotes): string => {

diff --git a/src/core/utils.ts b/src/core/utils.ts
@@ -52,6 +52,9 @@ const listenForConfigurationChanges = (statusBarItem: StatusBarItem): void => {
     if (
       event.affectsConfiguration(
         `${EXTENSION_NAME}.${ExtensionConfiguration.StatusBarIcon}`
+      ) ||
+      event.affectsConfiguration(
+        `${EXTENSION_NAME}.${ExtensionConfiguration.StatusBarEnabled}`
       )
     ) {
       const extensionConfiguration =
@@ -60,12 +63,16 @@ const listenForConfigurationChanges = (statusBarItem: StatusBarItem): void => {
       const statusBarIcon = determineStatusBarIcon(
         extensionConfiguration.get(ExtensionConfiguration.StatusBarIcon)
       );
+      const enableStatusBarIcon =
+        extensionConfiguration.get(ExtensionConfiguration.StatusBarEnabled) ===
+        true;
 
       updateStatusBarItem(
         statusBarItem,
         statusBarIcon,
         STATUSBAR_TOOLTIP,
-        Commands.OPEN_REPOSITORY
+        Commands.OPEN_REPOSITORY,
+        enableStatusBarIcon
       );
     }
   });
@@ -75,10 +82,27 @@ const updateStatusBarItem = (
   statusBarItem: StatusBarItem,
   text: string,
   tooltip: string,
-  command: Commands
+  command: Commands,
+  show = true
 ) => {
   statusBarItem.text = `$(${text})`;
   statusBarItem.tooltip = tooltip;
   statusBarItem.command = command;
-  statusBarItem.show();
+  show ? statusBarItem.show() : statusBarItem.hide();
+};
+
+export const formatRemoteOriginalUrl = (remoteOrigin: string): string => {
+  // Regular expression to match the Git origin format
+  const gitOriginRegex = /^(git@|https:\/\/)([^:/]+)[:\/](.+\/[^.]+)(\.git)?$/;
+  const match = remoteOrigin.match(gitOriginRegex);
+
+  if (match) {
+    const host = match[2].replace(":", "/"); // Replace ssh colon with http slash
+    const repositoryPath = match[3];
+
+    return `https://${host}/${repositoryPath}`;
+  } else {
+    console.error("Invalid Git origin format");
+    return remoteOrigin;
+  }
 };