From 60dcb3326ea5e70c8d1017dcd206013304a5c92e Mon Sep 17 00:00:00 2001 From: Liang Huang Date: Thu, 11 Jul 2019 18:50:38 -0400 Subject: [PATCH] rename TaskConfigurations.isConfiguredTask to isDetectedTask - isConfiguredTask is the wrong name, because a task should be a detected task if its definition is contributed by an extension or plugin Signed-off-by: Liang Huang --- packages/task/src/browser/task-configurations.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/task/src/browser/task-configurations.ts b/packages/task/src/browser/task-configurations.ts index d1e952e195a89..b45cf24311640 100644 --- a/packages/task/src/browser/task-configurations.ts +++ b/packages/task/src/browser/task-configurations.ts @@ -214,7 +214,7 @@ export class TaskConfigurations implements Disposable { const customizations: TaskCustomization[] = []; tasksArray.forEach(t => { - if (this.isConfiguredTask(t)) { + if (this.isDetectedTask(t)) { customizations.push(t); } else { configuredTasksArray.push(t); @@ -314,7 +314,7 @@ export class TaskConfigurations implements Disposable { protected filterDuplicates(tasks: TaskConfiguration[]): TaskConfiguration[] { const filteredTasks: TaskConfiguration[] = []; for (const task of tasks) { - if (filteredTasks.some(t => !this.isConfiguredTask(t) && t.label === task.label)) { + if (filteredTasks.some(t => !this.isDetectedTask(t) && t.label === task.label)) { // TODO: create a problem marker so that this issue will be visible in the editor? console.error(`Error parsing ${this.TASKFILE}: found duplicate entry for label: ${task.label}`); } else { @@ -328,7 +328,8 @@ export class TaskConfigurations implements Disposable { return new URI(configFileUri).parent.parent.path.toString(); } - private isConfiguredTask(task: TaskConfiguration): task is ContributedTaskConfiguration { + /** checks if the config is a detected / contributed task */ + private isDetectedTask(task: TaskConfiguration): task is ContributedTaskConfiguration { const taskDefinition = this.taskDefinitionRegistry.getDefinition(task); // it is considered as a customization if the task definition registry finds a def for the task configuration return !!taskDefinition;