From 1f394bfd0c15836f65092f9667155d182835bdb6 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Tue, 3 Aug 2021 16:15:07 +0200 Subject: [PATCH] workbench.action.tasks.build no longer triggers build but opens a list of tasks Fixes #130028 --- .../workbench/contrib/tasks/common/taskConfiguration.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts index 963131367597f..50ab002dd992b 100644 --- a/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts +++ b/src/vs/workbench/contrib/tasks/common/taskConfiguration.ts @@ -1741,9 +1741,14 @@ namespace TaskParser { } context.taskLoadIssues = Objects.deepClone(baseLoadIssues); } - if ((defaultBuildTask.rank > -1) && (defaultBuildTask.rank < 2) && defaultBuildTask.task) { + // There is some special logic for tasks with the labels "build" and "test". + // Even if they are not marked as a task group Build or Test, we automagically group them as such. + // However, if they are already grouped as Build or Test, we don't need to add this grouping. + const defaultBuildGroupName = Types.isString(defaultBuildTask.task?.configurationProperties.group) ? defaultBuildTask.task?.configurationProperties.group : defaultBuildTask.task?.configurationProperties.group?._id; + const defaultTestTaskGroupName = Types.isString(defaultTestTask.task?.configurationProperties.group) ? defaultTestTask.task?.configurationProperties.group : defaultTestTask.task?.configurationProperties.group?._id; + if ((defaultBuildGroupName !== Tasks.TaskGroup.Build._id) && (defaultBuildTask.rank > -1) && (defaultBuildTask.rank < 2) && defaultBuildTask.task) { defaultBuildTask.task.configurationProperties.group = Tasks.TaskGroup.Build; - } else if ((defaultTestTask.rank > -1) && (defaultTestTask.rank < 2) && defaultTestTask.task) { + } else if ((defaultTestTaskGroupName !== Tasks.TaskGroup.Test._id) && (defaultTestTask.rank > -1) && (defaultTestTask.rank < 2) && defaultTestTask.task) { defaultTestTask.task.configurationProperties.group = Tasks.TaskGroup.Test; }