Scope config lookup to workspace folder (#3798)

microsoft · Jan 19, 2023 · 1ee1c50 · 1ee1c50
1 parent aa14007
commit 1ee1c50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/debugging/DockerDebugConfigurationProvider.ts b/src/debugging/DockerDebugConfigurationProvider.ts
@@ -104,7 +104,7 @@ export class DockerDebugConfigurationProvider implements DebugConfigurationProvi
     }
 
     private async resolveDebugConfigurationInternal(context: DockerDebugContext, originalConfiguration: DockerDebugConfiguration): Promise<DockerDebugConfiguration | undefined> {
-        context.runDefinition = await getAssociatedDockerRunTask(originalConfiguration);
+        context.runDefinition = await getAssociatedDockerRunTask(originalConfiguration, context.folder);
         context.actionContext.telemetry.properties.runTaskFound = context.runDefinition ? 'true' : 'false';
 
         const helper = this.getHelper(context.platform);

diff --git a/src/tasks/DockerRunTaskProvider.ts b/src/tasks/DockerRunTaskProvider.ts
@@ -36,7 +36,7 @@ export class DockerRunTaskProvider extends DockerTaskProvider {
 
         context.actionContext.telemetry.properties.containerOS = definition.dockerRun.os || 'Linux';
 
-        context.buildDefinition = await getAssociatedDockerBuildTask(task);
+        context.buildDefinition = await getAssociatedDockerBuildTask(task, context.folder);
         context.actionContext.telemetry.properties.buildTaskFound = context.buildDefinition ? 'true' : 'false';
 
         const helper = this.getHelper(context.platform);

diff --git a/src/tasks/TaskHelper.ts b/src/tasks/TaskHelper.ts
@@ -103,14 +103,14 @@ export function registerTaskProviders(ctx: ExtensionContext): void {
 }
 
 export function hasTask(taskLabel: string, folder: WorkspaceFolder): boolean {
-    const workspaceTasks = workspace.getConfiguration('tasks', folder.uri);
+    const workspaceTasks = workspace.getConfiguration('tasks', folder);
     const allTasks = workspaceTasks && workspaceTasks.tasks as TaskDefinitionBase[] || [];
     return allTasks.findIndex(t => t.label === taskLabel) > -1;
 }
 
 export async function addTask(newTask: DockerBuildTaskDefinition | DockerRunTaskDefinition, folder: WorkspaceFolder, overwrite?: boolean): Promise<boolean> {
     // Using config API instead of tasks API means no wasted perf on re-resolving the tasks, and avoids confusion on resolved type !== true type
-    const workspaceTasks = workspace.getConfiguration('tasks', folder.uri);
+    const workspaceTasks = workspace.getConfiguration('tasks', folder);
     const allTasks = workspaceTasks && workspaceTasks.tasks as TaskDefinitionBase[] || [];
 
     const existingTaskIndex = allTasks.findIndex(t => t.label === newTask.label);
@@ -131,17 +131,17 @@ export async function addTask(newTask: DockerBuildTaskDefinition | DockerRunTask
     return true;
 }
 
-export async function getAssociatedDockerRunTask(debugConfiguration: DockerDebugConfiguration): Promise<DockerRunTaskDefinition | undefined> {
+export async function getAssociatedDockerRunTask(debugConfiguration: DockerDebugConfiguration, folder: WorkspaceFolder): Promise<DockerRunTaskDefinition | undefined> {
     // Using config API instead of tasks API means no wasted perf on re-resolving the tasks (not just our tasks), and avoids confusion on resolved type !== true type
-    const workspaceTasks = workspace.getConfiguration('tasks');
+    const workspaceTasks = workspace.getConfiguration('tasks', folder);
     const allTasks: TaskDefinitionBase[] = workspaceTasks && workspaceTasks.tasks as TaskDefinitionBase[] || [];
 
     return await recursiveFindTaskByType(allTasks, 'docker-run', debugConfiguration) as DockerRunTaskDefinition;
 }
 
-export async function getAssociatedDockerBuildTask(runTask: DockerRunTask): Promise<DockerBuildTaskDefinition | undefined> {
+export async function getAssociatedDockerBuildTask(runTask: DockerRunTask, folder: WorkspaceFolder): Promise<DockerBuildTaskDefinition | undefined> {
     // Using config API instead of tasks API means no wasted perf on re-resolving the tasks (not just our tasks), and avoids confusion on resolved type !== true type
-    const workspaceTasks = workspace.getConfiguration('tasks');
+    const workspaceTasks = workspace.getConfiguration('tasks', folder);
     const allTasks: TaskDefinitionBase[] = workspaceTasks && workspaceTasks.tasks as TaskDefinitionBase[] || [];
 
     // Due to inconsistencies in the Task API, runTask does not have its dependsOn, so we need to re-find it by label