diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts index 0ccefa7cbba..07cb56465a5 100644 --- a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts +++ b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts @@ -88,6 +88,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost } const forceHTTPS = (location.protocol === 'https:'); + const suffix = this._environmentService.debugExtensionHost && this._environmentService.debugRenderer ? '?debugged=1' : '?'; if (this._environmentService.options && this._environmentService.options.__uniqueWebWorkerExtensionHostOrigin) { const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate; @@ -100,11 +101,13 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost .replace('{{commit}}', commit) .replace('{{quality}}', quality) ); - return ( + const base = ( forceHTTPS ? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html` : `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html` ); + + return base + suffix; } } @@ -116,11 +119,13 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost if (this._productService.commit) { baseUrl += `/${this._productService.commit}`; } - return ( + const base = ( forceHTTPS ? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html` : `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html` ); + + return base + suffix; } return null; } @@ -152,7 +157,7 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost iframe.style.display = 'none'; const vscodeWebWorkerExtHostId = generateUuid(); - iframe.setAttribute('src', `${webWorkerExtensionHostIframeSrc}?vscodeWebWorkerExtHostId=${vscodeWebWorkerExtHostId}`); + iframe.setAttribute('src', `${webWorkerExtensionHostIframeSrc}&vscodeWebWorkerExtHostId=${vscodeWebWorkerExtHostId}`); const barrier = new Barrier(); let port!: MessagePort; @@ -242,7 +247,8 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost const nestedWorker = new Map(); - const worker = new DefaultWorkerFactory('WorkerExtensionHost').create( + const name = this._environmentService.debugRenderer && this._environmentService.debugExtensionHost ? 'DebugWorkerExtensionHost' : 'WorkerExtensionHost'; + const worker = new DefaultWorkerFactory(name).create( 'vs/workbench/services/extensions/worker/extensionHostWorker', (data: MessagePort | NewWorkerMessage | TerminateWorkerMessage | any) => { diff --git a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html index 0bf4a50d299..118e3ad53c3 100644 --- a/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html +++ b/src/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html @@ -6,8 +6,9 @@