development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #178679 from Mai-Lapyst/fix-all-ontasktype-exts-starting

Browse source 
Fix accidently starting all onTaskType extensions when running any task; fixes #175821
This commit is contained in:
Megan Rogge 2023-03-31 09:40:36 -07:00 committed by GitHub
parent e95e5ba68d 0689f4a987
commit b8a45b90b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View file

@ -725,7 +725,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
});
}
public async getTask(folder: IWorkspace | IWorkspaceFolder | string, identifier: string | ITaskIdentifier, compareId: boolean = false): Promise<Task | undefined> {
public async getTask(folder: IWorkspace | IWorkspaceFolder | string, identifier: string | ITaskIdentifier, compareId: boolean = false, type: string | undefined = undefined): Promise<Task | undefined> {
if (!(await this._trust())) {
return;
}
@ -762,7 +762,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
// We didn't find the task, so we need to ask all resolvers about it
const map = await this._getGroupedTasks();
const map = await this._getGroupedTasks({ type });
let values = map.get(folder);
values = values.concat(map.get(USER_TASKS_GROUP_KEY));
@ -1842,11 +1842,12 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
await this._updateWorkspaceTasks();
const taskFolder = task.getWorkspaceFolder();
const taskIdentifier = task.configurationProperties.identifier;
const taskType = CustomTask.is(task) ? task.customizes()?.type : (ContributedTask.is(task) ? task.type : undefined);
// Since we save before running tasks, the task may have changed as part of the save.
// However, if the TaskRunSource is not User, then we shouldn't try to fetch the task again
// since this can cause a new'd task to get overwritten with a provided task.
taskToRun = ((taskFolder && taskIdentifier && (runSource === TaskRunSource.User))
? await this.getTask(taskFolder, taskIdentifier) : task) ?? task;
? await this.getTask(taskFolder, taskIdentifier, false, taskType) : task) ?? task;
}
await ProblemMatcherRegistry.onReady();
const executeResult = runSource === TaskRunSource.Reconnect ? this._getTaskSystem().reconnect(taskToRun, resolver) : this._getTaskSystem().run(taskToRun, resolver);