Merge pull request #7315 from microsoft/ella/taskScope

elahehrashedi · web-flow · commit 57f9e1e5c9ff · 2021-04-12T14:32:52.000-07:00
Modify "Configure Task" behavior for multiroot
diff --git a/Extension/src/LanguageServer/cppBuildTaskProvider.ts b/Extension/src/LanguageServer/cppBuildTaskProvider.ts
@@ -194,7 +194,7 @@ export class CppBuildTaskProvider implements TaskProvider {
             }
         }
 
-        const scope: TaskScope = TaskScope.Workspace;
+        const scope: WorkspaceFolder | TaskScope = folder ? folder : TaskScope.Workspace;
         const task: CppBuildTask = new Task(definition, scope, definition.label, CppBuildTaskProvider.CppBuildSourceStr,
             new CustomExecution(async (resolvedDefinition: TaskDefinition): Promise<Pseudoterminal> =>
                 // When the task is executed, this callback will run. Here, we setup for running the task.

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ export class CppBuildTaskProvider implements TaskProvider {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- const scope: TaskScope = TaskScope.Workspace;`
	`197`	`+ const scope: WorkspaceFolder \| TaskScope = folder ? folder : TaskScope.Workspace;`
`198`	`198`	`const task: CppBuildTask = new Task(definition, scope, definition.label, CppBuildTaskProvider.CppBuildSourceStr,`
`199`	`199`	`new CustomExecution(async (resolvedDefinition: TaskDefinition): Promise<Pseudoterminal> =>`
`200`	`200`	`// When the task is executed, this callback will run. Here, we setup for running the task.`