Skip to content

Commit c722ca6

Browse files
authored
Check task uri when quick resolving dependencies (microsoft#144836)
Fixes microsoft#144761
1 parent 0af7459 commit c722ca6

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,8 +1585,13 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
15851585

15861586
let resolverData: Map<string, ResolverData> | undefined;
15871587

1588-
async function quickResolve(that: AbstractTaskService, identifier: string | TaskIdentifier) {
1588+
async function quickResolve(that: AbstractTaskService, uri: URI | string, identifier: string | TaskIdentifier) {
15891589
const foundTasks = await that._findWorkspaceTasks((task: Task | ConfiguringTask): boolean => {
1590+
const taskUri = ((ConfiguringTask.is(task) || CustomTask.is(task)) ? task._source.config.workspaceFolder?.uri : undefined);
1591+
const originalUri = (typeof uri === 'string' ? uri : uri.toString());
1592+
if (taskUri?.toString() !== originalUri) {
1593+
return false;
1594+
}
15901595
if (Types.isString(identifier)) {
15911596
return ((task._label === identifier) || (task.configurationProperties.identifier === identifier));
15921597
} else {
@@ -1649,7 +1654,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
16491654
return undefined;
16501655
}
16511656
if ((resolverData === undefined) && (grouped === undefined)) {
1652-
return (await quickResolve(this, identifier)) ?? fullResolve(this, uri, identifier);
1657+
return (await quickResolve(this, uri, identifier)) ?? fullResolve(this, uri, identifier);
16531658
} else {
16541659
return fullResolve(this, uri, identifier);
16551660
}

0 commit comments

Comments
 (0)