Change where task execution context is set

alexr00 · alexr00 · commit 2d7ae4a7d902 · 2020-07-20T13:11:56.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`334`	`334`	`this.setExecutionContexts();`
`335`	`335`	`}`
`336`	`336`
`337`		`- protected setExecutionContexts(custom: boolean = true, shell: boolean = false, process: boolean = false): void {`
	`337`	`+ protected setExecutionContexts(custom: boolean = true, shell: boolean = true, process: boolean = true): void {`
`338`	`338`	`const customContext = CustomExecutionSupportedContext.bindTo(this.contextKeyService);`
`339`	`339`	`customContext.set(custom);`
`340`	`340`	`const shellContext = ShellExecutionSupportedContext.bindTo(this.contextKeyService);`
`@@ -530,6 +530,9 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`public registerTaskSystem(key: string, info: TaskSystemInfo): void {`
	`533`	`+ if (info.platform === Platform.Platform.Web) {`
	`534`	`+ this.setExecutionContexts(true, false, false);`
	`535`	`+ }`
`533`	`536`	`this._taskSystemInfos.set(key, info);`
`534`	`537`	`}`
`535`	`538`