From e7f80c059b9985d1f0901535031f06e57fc666ff Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Tue, 30 May 2023 15:26:38 +0800 Subject: [PATCH 1/2] fix resolve tasks manager --- src/taskManager.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/taskManager.ts b/src/taskManager.ts index f8c0c9407..20a1112a9 100644 --- a/src/taskManager.ts +++ b/src/taskManager.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Friday, 27th September 2019 9:59:57 pm * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -52,7 +52,7 @@ export class TaskManager { return new Promise((resolve, reject) => { vscode.tasks.onDidEndTask((e) => { if ( - e.execution.task.definition.taskId.indexOf( + e.execution && e.execution.task.definition.taskId.indexOf( newTask.definition.taskId ) !== -1 ) { @@ -83,10 +83,13 @@ export class TaskManager { public static async runTasks() { return new Promise(async (resolve, reject) => { + if (TaskManager.tasks.length === 0) { + return resolve(); + } let lastExecution = await vscode.tasks.executeTask(TaskManager.tasks[0]); const taskDisposable = vscode.tasks.onDidEndTaskProcess(async (e) => { if ( - e.execution.task.definition.taskId.indexOf( + e.execution && e.execution.task.definition.taskId.indexOf( lastExecution.task.definition.taskId ) !== -1 ) { From fce23ae53fc780d17dfb1a9bf04b9f6c8dba4ca8 Mon Sep 17 00:00:00 2001 From: Brian Ignacio Date: Tue, 30 May 2023 15:35:37 +0800 Subject: [PATCH 2/2] fix lint --- src/taskManager.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/taskManager.ts b/src/taskManager.ts index 20a1112a9..7e325dfac 100644 --- a/src/taskManager.ts +++ b/src/taskManager.ts @@ -52,7 +52,8 @@ export class TaskManager { return new Promise((resolve, reject) => { vscode.tasks.onDidEndTask((e) => { if ( - e.execution && e.execution.task.definition.taskId.indexOf( + e.execution && + e.execution.task.definition.taskId.indexOf( newTask.definition.taskId ) !== -1 ) { @@ -89,7 +90,8 @@ export class TaskManager { let lastExecution = await vscode.tasks.executeTask(TaskManager.tasks[0]); const taskDisposable = vscode.tasks.onDidEndTaskProcess(async (e) => { if ( - e.execution && e.execution.task.definition.taskId.indexOf( + e.execution && + e.execution.task.definition.taskId.indexOf( lastExecution.task.definition.taskId ) !== -1 ) {