Skip to content

Check task uri when quick resolving dependencies #144836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexr00 merged 1 commit into from
Mar 10, 2022
Merged

Check task uri when quick resolving dependencies #144836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Check task uri when quick resolving dependencies 
Part of #144761
  • Loading branch information
@alexr00
alexr00 committed Mar 10, 2022
commit 15a84a593f7516e227166ac5b139555818fe32ae
9 changes: 7 additions & 2 deletions src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,8 +1585,13 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer

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

async function quickResolve(that: AbstractTaskService, identifier: string | TaskIdentifier) {
async function quickResolve(that: AbstractTaskService, uri: URI | string, identifier: string | TaskIdentifier) {
const foundTasks = await that._findWorkspaceTasks((task: Task | ConfiguringTask): boolean => {
const taskUri = ((ConfiguringTask.is(task) || CustomTask.is(task)) ? task._source.config.workspaceFolder?.uri : undefined);
const originalUri = (typeof uri === 'string' ? uri : uri.toString());
if (taskUri?.toString() !== originalUri) {
return false;
}
if (Types.isString(identifier)) {
return ((task._label === identifier) || (task.configurationProperties.identifier === identifier));
} else {
Expand Down Expand Up @@ -1649,7 +1654,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
return undefined;
}
if ((resolverData === undefined) && (grouped === undefined)) {
return (await quickResolve(this, identifier)) ?? fullResolve(this, uri, identifier);
return (await quickResolve(this, uri, identifier)) ?? fullResolve(this, uri, identifier);
} else {
return fullResolve(this, uri, identifier);
}
Expand Down