Fix Razor browser discovery issues on Mac and Linux (#6269)

Author: allisonchou

l10n/bundle.l10n.json

@@ -117,7 +117,7 @@
   "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.": "There was an unexpected error while launching your debugging session. Check the console for helpful logs and visit the debugging docs for more info.",
   "View Debug Docs": "View Debug Docs",
   "Ignore": "Ignore",
-  "Run and Debug: A valid browser is not installed": "Run and Debug: A valid browser is not installed",
+  "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.": "Run and Debug: A valid browser is not installed. Please install Edge or Chrome.",
   "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change": "dotnet.server.useOmnisharp option has changed. Please reload the window to apply the change",
   "Reload Window": "Reload Window",
   "C# configuration has changed. Would you like to relaunch the Language Server with your changes?": "C# configuration has changed. Would you like to relaunch the Language Server with your changes?",
@@ -152,4 +152,4 @@
   "Disable message in settings": "Disable message in settings",
   "Help": "Help",
   "The C# extension is still downloading packages. Please see progress in the output window below.": "The C# extension is still downloading packages. Please see progress in the output window below."
-}
+}

package-lock.json

@@ -83,8 +83,10 @@
     "@types/cross-spawn": "6.0.2",
     "@vscode/debugprotocol": "1.56.0",
     "@vscode/extension-telemetry": "0.6.2",
+    "@vscode/js-debug-browsers": "^1.1.0",
     "async-file": "2.0.2",
     "cross-spawn": "6.0.5",
+    "execa": "4.0.0",
     "fs-extra": "9.1.0",
     "http-proxy-agent": "4.0.1",
     "https-proxy-agent": "5.0.0",
@@ -102,7 +104,6 @@
     "tmp": "0.0.33",
     "uuid": "^9.0.0",
     "vscode-html-languageservice": "^5.0.1",
-    "vscode-js-debug-browsers": "^1.0.5",
     "vscode-jsonrpc": "8.2.0-next.0",
     "vscode-languageclient": "8.2.0-next.1",
     "vscode-languageserver-protocol": "3.17.4-next.1",

package.json

@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import execa = require('execa');
 import { promises, readFileSync } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';
 import * as vscode from 'vscode';
-import { ChromeBrowserFinder, EdgeBrowserFinder } from 'vscode-js-debug-browsers';
+import { ChromeBrowserFinder, EdgeBrowserFinder } from '@vscode/js-debug-browsers';
 import { RazorLogger } from '../razorLogger';
 import { JS_DEBUG_NAME, SERVER_APP_NAME } from './constants';
 import { onDidTerminateDebugSession } from './terminateDebugHandler';
@@ -180,28 +181,33 @@ export class BlazorDebugConfigurationProvider implements vscode.DebugConfigurati
 
     public static async determineBrowserType(): Promise<string | undefined> {
         // There was no browser specified by the user, so we will do some auto-detection to find a browser,
-        // favoring chrome if multiple valid options are installed.
-        const chromeBrowserFinder = new ChromeBrowserFinder(process.env, promises, null);
-        const chromeInstallations = await chromeBrowserFinder.findAll();
-        if (chromeInstallations.length > 0) {
+        // favoring Edge if multiple valid options are installed.
+        const edgeBrowserFinder = new EdgeBrowserFinder(process.env, promises, execa);
+        const edgeInstallations = await edgeBrowserFinder.findAll();
+        if (edgeInstallations.length > 0) {
             showInformationMessage(
                 vscode,
-                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Chrome'`)
+                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Edge'`)
             );
-            return BlazorDebugConfigurationProvider.chromeBrowserType;
+
+            return BlazorDebugConfigurationProvider.edgeBrowserType;
         }
 
-        const edgeBrowserFinder = new EdgeBrowserFinder(process.env, promises, null);
-        const edgeInstallations = await edgeBrowserFinder.findAll();
-        if (edgeInstallations.length > 0) {
+        const chromeBrowserFinder = new ChromeBrowserFinder(process.env, promises, execa);
+        const chromeInstallations = await chromeBrowserFinder.findAll();
+        if (chromeInstallations.length > 0) {
             showInformationMessage(
                 vscode,
-                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Edge'`)
+                BlazorDebugConfigurationProvider.autoDetectUserNotice.replace('{0}', `'Chrome'`)
             );
-            return BlazorDebugConfigurationProvider.edgeBrowserType;
+
+            return BlazorDebugConfigurationProvider.chromeBrowserType;
         }
 
-        showErrorMessage(vscode, vscode.l10n.t('Run and Debug: A valid browser is not installed'));
+        showErrorMessage(
+            vscode,
+            vscode.l10n.t('Run and Debug: A valid browser is not installed. Please install Edge or Chrome.')
+        );
         return undefined;
     }
 }