Allow user tasks to be passed as parameters to Run Task

alexr00 · alexr00 · commit 1f86149904df · 2020-02-21T11:40:38.000+01:00
Fixes microsoft#90344
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -1167,8 +1167,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			}
 		});
 		let resolver: ITaskResolver = {
-			resolve: (uri: URI, alias: string) => {
-				let data = resolverData.get(uri.toString());
+			resolve: (uri: URI | string, alias: string) => {
+				let data = resolverData.get(typeof uri === 'string' ? uri : uri.toString());
 				if (!data) {
 					return undefined;
 				}
@@ -1234,8 +1234,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		});
 
 		return {
-			resolve: (uri: URI, identifier: string | TaskIdentifier | undefined) => {
-				let data = uri ? resolverData.get(uri.toString()) : undefined;
+			resolve: (uri: URI | string, identifier: string | TaskIdentifier | undefined) => {
+				let data = resolverData.get(typeof uri === 'string' ? uri : uri.toString());
 				if (!data || !identifier) {
 					return undefined;
 				}
@@ -2116,9 +2116,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (identifier !== undefined) {
 			this.getGroupedTasks().then((grouped) => {
 				let resolver = this.createResolver(grouped);
-				let folders = this.contextService.getWorkspace().folders;
+				let folders: (IWorkspaceFolder | string)[] = this.contextService.getWorkspace().folders;
+				folders = folders.concat([USER_TASKS_GROUP_KEY]);
 				for (let folder of folders) {
-					let task = resolver.resolve(folder.uri, identifier);
+					let task = resolver.resolve(typeof folder === 'string' ? folder : folder.uri, identifier);
 					if (task) {
 						this.run(task).then(undefined, reason => {
 							// eat the error, it has already been surfaced to the user and we don't care about it here
diff --git a/src/vs/workbench/contrib/tasks/common/taskSystem.ts b/src/vs/workbench/contrib/tasks/common/taskSystem.ts
@@ -93,7 +93,7 @@ export interface ITaskExecuteResult {
 }
 
 export interface ITaskResolver {
-	resolve(uri: URI, identifier: string | KeyedTaskIdentifier | undefined): Task | undefined;
+	resolve(uri: URI | string, identifier: string | KeyedTaskIdentifier | undefined): Task | undefined;
 }
 
 export interface TaskTerminateResponse extends TerminateResponse {
diff --git a/src/vs/workbench/contrib/tasks/common/tasks.ts b/src/vs/workbench/contrib/tasks/common/tasks.ts
@@ -438,7 +438,7 @@ export interface KeyedTaskIdentifier extends TaskIdentifier {
 }
 
 export interface TaskDependency {
-	uri: URI;
+	uri: URI | string;
 	task: string | KeyedTaskIdentifier | undefined;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export interface ITaskExecuteResult {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`export interface ITaskResolver {`
`96`		`- resolve(uri: URI, identifier: string \| KeyedTaskIdentifier \| undefined): Task \| undefined;`
	`96`	`+ resolve(uri: URI \| string, identifier: string \| KeyedTaskIdentifier \| undefined): Task \| undefined;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`export interface TaskTerminateResponse extends TerminateResponse {`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ export interface KeyedTaskIdentifier extends TaskIdentifier {`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`export interface TaskDependency {`
`441`		`- uri: URI;`
	`441`	`+ uri: URI \| string;`
`442`	`442`	`task: string \| KeyedTaskIdentifier \| undefined;`
`443`	`443`	`}`
`444`	`444`