GH-576 Usability improvements for macOS

Author: jisedlac

integrations/vscode/src/download.ts

@@ -134,7 +134,7 @@ async function selectFolder(): Promise<string | undefined> {
         canSelectFolders: true,
         canSelectMany: false,
         defaultUri: vscode.Uri.file(os.homedir()),
-        openLabel: 'Select'
+        openLabel: process.platform === 'darwin' ? 'Select Target Folder' : 'Select'
     });
     return selectedFolder?.length === 1 ? selectedFolder[0].fsPath : undefined;
 }

integrations/vscode/src/jdk.ts

@@ -100,9 +100,16 @@ async function select(): Promise<string | undefined> {
         canSelectFolders: true,
         canSelectMany: false,
         defaultUri: vscode.Uri.file(os.homedir()),
-        openLabel: 'Select'
+        openLabel: process.platform !== 'darwin' ? 'Select JDK Installation' : 'Select'
     });
-    return selectedJDKUri?.length === 1 ? selectedJDKUri[0].fsPath : undefined;
+    const jdkPath = selectedJDKUri?.length === 1 ? selectedJDKUri[0].fsPath : undefined;
+    if (jdkPath && process.platform === 'darwin') {
+        const jdkHomePath = path.join(jdkPath, 'Contents', 'Home');
+        if (fs.existsSync(jdkHomePath)) {
+            return jdkHomePath;
+        }
+    }
+    return jdkPath;
 }
 
 export function isSupportedJDK(jdkPath: string): boolean {

integrations/vscode/src/visualvm.ts

@@ -81,7 +81,7 @@ export async function select(visualVMPath?: string) {
             canSelectFolders: macOS ? false : true,
             canSelectMany: false,
             defaultUri: macOS ? vscode.Uri.file('/Applications') : savedVisualVMUri || vscode.Uri.file(os.homedir()),
-            openLabel: 'Select'
+            openLabel: process.platform === 'darwin' ? 'Select VisualVM Installation' : 'Select'
         });
         if (selectedVisualVMUri?.length === 1) {
             visualVMPath = selectedVisualVMUri[0].fsPath;