Skip to content

Commit d4bbb6d

Browse files
committed
Merge branch 'topic/vscode-tasks' into 'master'
Set vscode task group on provided tasks Closes #1410 See merge request eng/ide/ada_language_server!1669
2 parents 3b9fde7 + 0d84cc3 commit d4bbb6d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

integration/vscode/ada/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@
880880
{
881881
"id": "als-get-started-build",
882882
"title": "Build your project",
883-
"description": "Use automatically provided `ada` tasks to build your project.\n[Build Project](command:workbench.action.tasks.runTask)",
883+
"description": "Use automatically provided `ada` tasks to build your project.\n[Run Build Task](command:workbench.action.tasks.build)",
884884
"media": {
885885
"markdown": "media/build.md"
886886
},

integration/vscode/ada/src/taskProviders.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,6 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
453453
tDecl.problemMatchers
454454
);
455455

456-
if (tDecl.taskGroup) {
457-
task.group = tDecl.taskGroup;
458-
}
459-
460456
/**
461457
* Ideally we would have liked to provide unresolved tasks and let
462458
* resolving only happen in the resolveTask method, but that's not
@@ -466,6 +462,13 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
466462
const resolvedTask = await this.resolveTask(task, token);
467463

468464
if (resolvedTask) {
465+
/**
466+
* Set other properties on the resolved task
467+
*/
468+
if (tDecl.taskGroup) {
469+
resolvedTask.group = tDecl.taskGroup;
470+
}
471+
469472
result.push(resolvedTask);
470473
} else {
471474
logger.error(`Failed to resolve task: ${JSON.stringify(task, undefined, 2)}`);

0 commit comments

Comments
 (0)