Finalize task custom execution variable resolving

Fixes #81007
This commit is contained in:
Alex Ross
2020-08-20 13:48:42 +02:00
parent 362e49228c
commit 640caaef05
7 changed files with 12 additions and 26 deletions

View File

@@ -418,8 +418,8 @@ export class MainThreadTask implements MainThreadTaskShape {
const task = event.__task!;
if (event.kind === TaskEventKind.Start) {
const execution = TaskExecutionDTO.from(task.getTaskExecution());
let resolvedDefinition: TaskDefinitionDTO | undefined;
if (execution.task && execution.task.execution && CustomExecutionDTO.is(execution.task.execution) && event.resolvedVariables) {
let resolvedDefinition: TaskDefinitionDTO = execution.task!.definition;
if (execution.task?.execution && CustomExecutionDTO.is(execution.task.execution) && event.resolvedVariables) {
const dictionary: IStringDictionary<string> = {};
Array.from(event.resolvedVariables.entries()).forEach(entry => dictionary[entry[0]] = entry[1]);
resolvedDefinition = await this._configurationResolverService.resolveAny(task.getWorkspaceFolder(),