Fix global tasks again

alexr00 · alexr00 · commit 2d96b9b616db · 2019-10-07T12:41:19.000+02:00
Fixes microsoft#78817
diff --git a/src/vs/workbench/api/browser/mainThreadTask.ts b/src/vs/workbench/api/browser/mainThreadTask.ts
@@ -264,7 +264,7 @@ namespace TaskSourceDTO {
 			}
 		} else if (value.kind === TaskSourceKind.Workspace) {
 			result.extensionId = '$core';
-			result.scope = value.config.workspaceFolder.uri;
+			result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri : TaskScope.Global;
 		}
 		return result;
 	}
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -983,7 +983,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	private getResourceForTask(task: CustomTask): URI {
 		let uri = this.getResourceForKind(task._source.kind);
 		if (!uri) {
-			uri = task.getWorkspaceFolder().toResource(task._source.config.file);
+			const taskFolder = task.getWorkspaceFolder();
+			if (taskFolder) {
+				uri = taskFolder.toResource(task._source.config.file);
+			} else {
+				uri = this.workspaceFolders[0].uri;
+			}
 		}
 		return uri;
 	}
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -462,7 +462,14 @@ export class TerminalTaskSystem implements ITaskSystem {
 	}
 
 	private executeCommand(task: CustomTask | ContributedTask, trigger: string): Promise<ITaskSummary> {
-		const workspaceFolder = this.currentTask.workspaceFolder = task.getWorkspaceFolder();
+		const taskWorkspaceFolder = task.getWorkspaceFolder();
+		let workspaceFolder: IWorkspaceFolder | undefined;
+		if (taskWorkspaceFolder) {
+			workspaceFolder = this.currentTask.workspaceFolder = taskWorkspaceFolder;
+		} else {
+			const folders = this.contextService.getWorkspace().folders;
+			workspaceFolder = folders.length > 0 ? folders[0] : undefined;
+		}
 		const systemInfo: TaskSystemInfo | undefined = this.currentTask.systemInfo = workspaceFolder ? this.taskSystemInfoResolver(workspaceFolder) : undefined;
 
 		let variables = new Set<string>();
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -380,7 +380,7 @@ export namespace TaskSourceKind {
 }
 
 export interface TaskSourceConfigElement {
-	workspaceFolder: IWorkspaceFolder;
+	workspaceFolder?: IWorkspaceFolder;
 	workspace?: IWorkspace;
 	file: string;
 	index: number;
@@ -728,7 +728,7 @@ export class CustomTask extends CommonTask {
 		return JSON.stringify(key);
 	}
 
-	public getWorkspaceFolder(): IWorkspaceFolder {
+	public getWorkspaceFolder(): IWorkspaceFolder | undefined {
 		return this._source.config.workspaceFolder;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ namespace TaskSourceDTO {`
`264`	`264`	`}`
`265`	`265`	`} else if (value.kind === TaskSourceKind.Workspace) {`
`266`	`266`	`result.extensionId = '$core';`
`267`		`- result.scope = value.config.workspaceFolder.uri;`
	`267`	`+ result.scope = value.config.workspaceFolder ? value.config.workspaceFolder.uri : TaskScope.Global;`
`268`	`268`	`}`
`269`	`269`	`return result;`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -983,7 +983,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`983`	`983`	`private getResourceForTask(task: CustomTask): URI {`
`984`	`984`	`let uri = this.getResourceForKind(task._source.kind);`
`985`	`985`	`if (!uri) {`
`986`		`- uri = task.getWorkspaceFolder().toResource(task._source.config.file);`
	`986`	`+ const taskFolder = task.getWorkspaceFolder();`
	`987`	`+ if (taskFolder) {`
	`988`	`+ uri = taskFolder.toResource(task._source.config.file);`
	`989`	`+ } else {`
	`990`	`+ uri = this.workspaceFolders[0].uri;`
	`991`	`+ }`
`987`	`992`	`}`
`988`	`993`	`return uri;`
`989`	`994`	`}`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ export namespace TaskSourceKind {`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`export interface TaskSourceConfigElement {`
`383`		`- workspaceFolder: IWorkspaceFolder;`
	`383`	`+ workspaceFolder?: IWorkspaceFolder;`
`384`	`384`	`workspace?: IWorkspace;`
`385`	`385`	`file: string;`
`386`	`386`	`index: number;`
`@@ -728,7 +728,7 @@ export class CustomTask extends CommonTask {`
`728`	`728`	`return JSON.stringify(key);`
`729`	`729`	`}`
`730`	`730`
`731`		`- public getWorkspaceFolder(): IWorkspaceFolder {`
	`731`	`+ public getWorkspaceFolder(): IWorkspaceFolder \| undefined {`
`732`	`732`	`return this._source.config.workspaceFolder;`
`733`	`733`	`}`
`734`	`734`