From 76e45c2b69d5eee655500ae21880319e7792d4d4 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 8 Sep 2020 11:52:54 -0700
Subject: [PATCH] debug: make serverReadyAction play nicely with js-debug

Fixes https://github.com/microsoft/vscode/issues/86035
Fixes https://github.com/microsoft/vscode-js-debug/issues/440
---
 .../debug-server-ready/src/extension.ts       | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/extensions/debug-server-ready/src/extension.ts b/extensions/debug-server-ready/src/extension.ts
index 91e996d665b..9f8737f307f 100644
--- a/extensions/debug-server-ready/src/extension.ts
+++ b/extensions/debug-server-ready/src/extension.ts
@@ -146,18 +146,13 @@ class ServerReadyDetector extends vscode.Disposable {
 				break;
 
 			case 'debugWithChrome':
-				if (vscode.env.remoteName === 'wsl' || !!vscode.extensions.getExtension('msjsdiag.debugger-for-chrome')) {
-					vscode.debug.startDebugging(session.workspaceFolder, {
-						type: 'chrome',
-						name: 'Chrome Debug',
-						request: 'launch',
-						url: uri,
-						webRoot: args.webRoot || WEB_ROOT
-					}, session);
-				} else {
-					const errMsg = localize('server.ready.chrome.not.installed', "The action '{0}' requires the '{1}' extension.", 'debugWithChrome', 'Debugger for Chrome');
-					vscode.window.showErrorMessage(errMsg, { modal: true }).then(_ => undefined);
-				}
+				vscode.debug.startDebugging(session.workspaceFolder, {
+					type: 'pwa-chrome',
+					name: 'Chrome Debug',
+					request: 'launch',
+					url: uri,
+					webRoot: args.webRoot || WEB_ROOT
+				});
 				break;
 
 			default:
-- 
GitLab