Tasks without a registered definition should run (microsoft#102696)

alexr00 · web-flow · commit 5e5fa3edde19 · 2020-07-16T14:42:02.000+02:00
Fixes microsoft#102684
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/workspace.tasks.test.ts
@@ -18,7 +18,7 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 			disposables.length = 0;
 		});
 
-		test.skip('CustomExecution task should start and shutdown successfully', (done) => {
+		test('CustomExecution task should start and shutdown successfully', (done) => {
 			interface CustomTestingTaskDefinition extends TaskDefinition {
 				/**
 				 * One of the task properties. This can be used to customize the task in the tasks.json
@@ -110,7 +110,7 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 			commands.executeCommand('workbench.action.tasks.runTask', `${taskType}: ${taskName}`);
 		});
 
-		test.skip('sync CustomExecution task should flush all data on close', (done) => {
+		test('sync CustomExecution task should flush all data on close', (done) => {
 			interface CustomTestingTaskDefinition extends TaskDefinition {
 				/**
 				 * One of the task properties. This can be used to customize the task in the tasks.json
@@ -222,7 +222,7 @@ import { window, tasks, Disposable, TaskDefinition, Task, EventEmitter, CustomEx
 		});
 
 		// https://github.com/microsoft/vscode/issues/100577
-		test.skip('A CustomExecution task can be fetched and executed', () => {
+		test('A CustomExecution task can be fetched and executed', () => {
 			return new Promise(async (resolve, reject) => {
 				class CustomTerminal implements Pseudoterminal {
 					private readonly writeEmitter = new EventEmitter<string>();
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -1584,7 +1584,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 
 	private isTaskProviderEnabled(type: string) {
 		const definition = TaskDefinitionRegistry.get(type);
-		return !definition.when || this.contextKeyService.contextMatchesRules(definition.when);
+		return !definition || !definition.when || this.contextKeyService.contextMatchesRules(definition.when);
 	}
 
 	private getGroupedTasks(type?: string): Promise<TaskMap> {

Original file line number	Diff line number	Diff line change
`@@ -1584,7 +1584,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`1584`	`1584`
`1585`	`1585`	`private isTaskProviderEnabled(type: string) {`
`1586`	`1586`	`const definition = TaskDefinitionRegistry.get(type);`
`1587`		`- return !definition.when \|\| this.contextKeyService.contextMatchesRules(definition.when);`
	`1587`	`+ return !definition \|\| !definition.when \|\| this.contextKeyService.contextMatchesRules(definition.when);`
`1588`	`1588`	`}`
`1589`	`1589`
`1590`	`1590`	`private getGroupedTasks(type?: string): Promise<TaskMap> {`