Merge branch 'dbaeumer/48831'

src/vs/workbench/parts/tasks/common/tasks.ts

@@ -456,6 +456,12 @@ export namespace CustomTask {
 		};
 		return result;
 	}
+	export function customizes(task: CustomTask): TaskIdentifier {
+		if (task._source && task._source.customizes) {
+			return task._source.customizes;
+		}
+		return undefined;
+	}
 }
 
 export interface ConfiguringTask extends CommonTask, ConfigurationProperties {

src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts

@@ -696,9 +696,17 @@ class TaskService implements ITaskService {
 			let result: Task[] = [];
 			map.forEach((tasks) => {
 				for (let task of tasks) {
-					let definition = Task.getTaskDefinition(task);
-					if (definition && definition.type === filter.type) {
+					if (ContributedTask.is(task) && task.defines.type === filter.type) {
 						result.push(task);
+					} else if (CustomTask.is(task)) {
+						if (task.type === filter.type) {
+							result.push(task);
+						} else {
+							let customizes = CustomTask.customizes(task);
+							if (customizes && customizes.type === filter.type) {
+								result.push(task);
+							}
+						}
 					}
 				}
 			});