Skip to content

Commit 358f70c

Browse files
authored
Fix some invalid assumptions for tasks (#13989)
1 parent 856a6dc commit 358f70c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Extension/src/LanguageServer/cppBuildTaskProvider.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ export class CppBuildTaskProvider implements TaskProvider {
245245
const cppBuildTask: CppBuildTask = new Task(definition, TaskScope.Workspace, task.label, ext.CppSourceStr);
246246
cppBuildTask.detail = task.detail;
247247
cppBuildTask.existing = true;
248-
if (task.group.isDefault) {
248+
if (!util.isString(task.group) && task.group.isDefault) {
249249
cppBuildTask.isDefault = true;
250250
}
251251
return cppBuildTask;
@@ -292,9 +292,9 @@ export class CppBuildTaskProvider implements TaskProvider {
292292
if (setAsDefault) {
293293
rawTasksJson.tasks.forEach((task: any) => {
294294
if (task.label === selectedTask?.definition.label) {
295-
task.group = { kind: "build", "isDefault": true };
296-
} else if (task.group.kind && task.group.kind === "build" && task.group.isDefault && task.group.isDefault === true) {
297-
task.group = "build";
295+
task.group = { kind: "build", isDefault: true };
296+
} else if (!util.isString(task.group) && task.group?.kind === "build" && task.group?.isDefault) {
297+
task.group.isDefault = false;
298298
}
299299
});
300300
}
@@ -303,7 +303,7 @@ export class CppBuildTaskProvider implements TaskProvider {
303303
const newTask: any = {
304304
...selectedTask.definition,
305305
problemMatcher: selectedTask.problemMatchers,
306-
group: setAsDefault ? { kind: "build", "isDefault": true } : "build",
306+
group: setAsDefault ? { kind: "build", isDefault: true } : "build",
307307
detail: localize("task.generated.by.debugger", "Task generated by Debugger.")
308308
};
309309
rawTasksJson.tasks.push(newTask);

0 commit comments

Comments
 (0)