From 2d7ae4a7d902b42ecfd41bafba9ff79ff085f690 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Mon, 20 Jul 2020 13:11:33 +0200
Subject: [PATCH] Change where task execution context is set

---
 src/vs/workbench/api/browser/mainThreadTask.ts       |  3 +++
 src/vs/workbench/api/common/extHostTask.ts           | 12 +++++-------
 .../contrib/tasks/browser/abstractTaskService.ts     |  5 ++++-
 .../contrib/tasks/electron-browser/taskService.ts    |  4 ----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
index a779de27b58..e4166f6df8f 100644
--- a/src/vs/workbench/api/browser/mainThreadTask.ts
+++ b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -613,6 +613,9 @@ export class MainThreadTask implements MainThreadTaskShape {
 	public $registerTaskSystem(key: string, info: TaskSystemInfoDTO): void {
 		let platform: Platform.Platform;
 		switch (info.platform) {
+			case 'Web':
+				platform = Platform.Platform.Web;
+				break;
 			case 'win32':
 				platform = Platform.Platform.Windows;
 				break;
diff --git a/src/vs/workbench/api/common/extHostTask.ts b/src/vs/workbench/api/common/extHostTask.ts
index 066e6ddb489..785685a2679 100644
--- a/src/vs/workbench/api/common/extHostTask.ts
+++ b/src/vs/workbench/api/common/extHostTask.ts
@@ -696,13 +696,11 @@ export class WorkerExtHostTask extends ExtHostTaskBase {
 		@IExtHostApiDeprecationService deprecationService: IExtHostApiDeprecationService
 	) {
 		super(extHostRpc, initData, workspaceService, editorService, configurationService, extHostTerminalService, logService, deprecationService);
-		if (initData.remote.isRemote && initData.remote.authority) {
-			this.registerTaskSystem(Schemas.vscodeRemote, {
-				scheme: Schemas.vscodeRemote,
-				authority: initData.remote.authority,
-				platform: Platform.PlatformToString(Platform.Platform.Web)
-			});
-		}
+		this.registerTaskSystem(Schemas.vscodeRemote, {
+			scheme: Schemas.vscodeRemote,
+			authority: '',
+			platform: Platform.PlatformToString(Platform.Platform.Web)
+		});
 	}
 
 	public async executeTask(extension: IExtensionDescription, task: vscode.Task): Promise<vscode.TaskExecution> {
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
index 1f84fabf713..7732517c737 100644
--- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -334,7 +334,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		this.setExecutionContexts();
 	}
 
-	protected setExecutionContexts(custom: boolean = true, shell: boolean = false, process: boolean = false): void {
+	protected setExecutionContexts(custom: boolean = true, shell: boolean = true, process: boolean = true): void {
 		const customContext = CustomExecutionSupportedContext.bindTo(this.contextKeyService);
 		customContext.set(custom);
 		const shellContext = ShellExecutionSupportedContext.bindTo(this.contextKeyService);
@@ -530,6 +530,9 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	}
 
 	public registerTaskSystem(key: string, info: TaskSystemInfo): void {
+		if (info.platform === Platform.Platform.Web) {
+			this.setExecutionContexts(true, false, false);
+		}
 		this._taskSystemInfos.set(key, info);
 	}
 
diff --git a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
index 16470daef7b..4dbac3fbf91 100644
--- a/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
+++ b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts
@@ -25,10 +25,6 @@ interface WorkspaceFolderConfigurationResult {
 export class TaskService extends AbstractTaskService {
 	private _configHasErrors: boolean = false;
 
-	protected setExecutionContexts(): void {
-		super.setExecutionContexts(true, true, true);
-	}
-
 	protected getTaskSystem(): ITaskSystem {
 		if (this._taskSystem) {
 			return this._taskSystem;