Merge pull request #14628 from OfficeDev/qinzhouxu/debug-telemetry-cherry-pick

fix: cherry-pick debug telemetry missing and terminate tasks failure

Author: wh-alice

packages/vscode-extension/src/debug/officeTaskHandler.ts

@@ -59,15 +59,17 @@ function isDebugPreLaunchTask(task: vscode.Task): boolean {
     // Debug: Excel Desktop
     if (task.execution && <vscode.ShellExecution>task.execution) {
       const execution = <vscode.ShellExecution>task.execution;
-      if (execution.command) {
-        const commandLine =
-          execution.commandLine ||
-          `${
-            typeof execution.command === "string" ? execution.command : execution.command.value
-          } ${(execution.args || []).join(" ")}`;
-        if (/npm[\s]+run[\s]+start:desktop -- --app (word|excel|powerpoint)/i.test(commandLine)) {
-          return true;
-        }
+      const commandLine =
+        execution.commandLine ||
+        `${
+          execution.command
+            ? typeof execution.command === "string"
+              ? execution.command
+              : execution.command.value
+            : ""
+        } ${(execution.args || []).join(" ")}`;
+      if (/npm[\s]+run[\s]+start:desktop -- --app (word|excel|powerpoint)/i.test(commandLine)) {
+        return true;
       }
     }
   }

packages/vscode-extension/src/debug/teamsfxTaskHandler.ts

@@ -139,13 +139,15 @@ function isTeamsfxTask(task: vscode.Task): boolean {
     let commandLine: string | undefined;
     if (task.execution && <vscode.ShellExecution>task.execution) {
       const execution = <vscode.ShellExecution>task.execution;
-      if (execution.command) {
-        commandLine =
-          execution.commandLine ||
-          `${
-            typeof execution.command === "string" ? execution.command : execution.command.value
-          } ${(execution.args || []).join(" ")}`;
-      }
+      commandLine =
+        execution.commandLine ||
+        `${
+          execution.command
+            ? typeof execution.command === "string"
+              ? execution.command
+              : execution.command.value
+            : ""
+        } ${(execution.args || []).join(" ")}`;
     }
     if (commandLine !== undefined) {
       if (/(npm|yarn)[\s]+(run )?[\s]*[^:\s]+:teamsfx/i.test(commandLine)) {
@@ -168,15 +170,17 @@ function isLaunchTestToolTask(task: vscode.Task): boolean {
     // dev:teamsfx and watch:teamsfx
     if (task.execution && <vscode.ShellExecution>task.execution) {
       const execution = <vscode.ShellExecution>task.execution;
-      if (execution.command) {
-        const commandLine =
-          execution.commandLine ||
-          `${
-            typeof execution.command === "string" ? execution.command : execution.command.value
-          } ${(execution.args || []).join(" ")}`;
-        if (/(npm|yarn)[\s]+(run )?[\s]*[^:\s]+:teamsfx:launch-testtool/i.test(commandLine)) {
-          return true;
-        }
+      const commandLine =
+        execution.commandLine ||
+        `${
+          execution.command
+            ? typeof execution.command === "string"
+              ? execution.command
+              : execution.command.value
+            : ""
+        } ${(execution.args || []).join(" ")}`;
+      if (/(npm|yarn)[\s]+(run )?[\s]*[^:\s]+:teamsfx:launch-testtool/i.test(commandLine)) {
+        return true;
       }
     }
   }