Cleanup task fetching for project panel (#1620)

- It was including any non-"swift-plugin" task such as globally configed
  node.js ones I had setup
- Resolve CWD similar to tasks to make sure code-workspace ones are included

Issue: #1072

Author: award999

src/tasks/SwiftTaskProvider.ts

@@ -24,7 +24,7 @@ import { swiftRuntimeEnv } from "../utilities/utilities";
 import { Version } from "../utilities/version";
 import { SwiftToolchain } from "../toolchain/toolchain";
 import { SwiftExecution } from "../tasks/SwiftExecution";
-import { packageName, resolveScope, resolveTaskCwd } from "../utilities/tasks";
+import { getPlatformConfig, packageName, resolveScope, resolveTaskCwd } from "../utilities/tasks";
 import { BuildConfigurationFactory } from "../debugger/buildConfig";
 
 /**
@@ -50,7 +50,7 @@ interface TaskConfig {
     showBuildStatus?: ShowBuildStatusOptions;
 }
 
-interface TaskPlatformSpecificConfig {
+export interface TaskPlatformSpecificConfig {
     args?: string[];
     cwd?: string;
     env?: { [name: string]: unknown };
@@ -447,14 +447,7 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
         const toolchain = currentFolder.toolchain;
         const swift = toolchain.getToolchainExecutable("swift");
         // platform specific
-        let platform: TaskPlatformSpecificConfig | undefined;
-        if (process.platform === "win32") {
-            platform = task.definition.windows;
-        } else if (process.platform === "linux") {
-            platform = task.definition.linux;
-        } else if (process.platform === "darwin") {
-            platform = task.definition.macos;
-        }
+        const platform: TaskPlatformSpecificConfig | undefined = getPlatformConfig(task);
         // get args and cwd values from either platform specific block or base
         const args = (platform?.args ?? task.definition.args ?? []).map(
             substituteVariablesInString

src/ui/ProjectPanelProvider.ts

@@ -21,6 +21,8 @@ import { FolderOperation } from "../WorkspaceContext";
 import contextKeys from "../contextKeys";
 import { Dependency, ResolvedDependency, Target } from "../SwiftPackage";
 import { FolderContext } from "../FolderContext";
+import { getPlatformConfig, resolveTaskCwd } from "../utilities/tasks";
+import { SwiftTask, TaskPlatformSpecificConfig } from "../tasks/SwiftTaskProvider";
 
 const LOADING_ICON = "loading~spin";
 /**
@@ -573,17 +575,20 @@ export class ProjectPanelProvider implements vscode.TreeDataProvider<TreeNode> {
     }
 
     private async tasks(folderContext: FolderContext): Promise<TaskNode[]> {
-        const tasks = await vscode.tasks.fetchTasks();
+        const tasks = await vscode.tasks.fetchTasks({ type: "swift" });
 
         return (
             tasks
                 // Plugin tasks are shown under the Commands header
-                .filter(
-                    task =>
-                        (!task.definition.cwd ||
-                            task.definition.cwd === folderContext.folder.fsPath) &&
-                        task.source !== "swift-plugin"
-                )
+                .filter(task => {
+                    const platform: TaskPlatformSpecificConfig | undefined =
+                        getPlatformConfig(task);
+                    return (
+                        !task.definition.cwd ||
+                        resolveTaskCwd(task, platform?.cwd ?? task.definition.cwd) ===
+                            folderContext.folder.fsPath
+                    );
+                })
                 .map(
                     (task, i) =>
                         new TaskNode(
@@ -631,7 +636,7 @@ export class ProjectPanelProvider implements vscode.TreeDataProvider<TreeNode> {
  * This is a workaround for the lack of an event when tasks are added or removed.
  */
 class TaskPoller implements vscode.Disposable {
-    private previousTasks: vscode.Task[] = [];
+    private previousTasks: SwiftTask[] = [];
     private timeout?: NodeJS.Timeout;
     private static POLL_INTERVAL = 5000;
 
@@ -641,15 +646,13 @@ class TaskPoller implements vscode.Disposable {
 
     private async pollTasks() {
         try {
-            const tasks = await vscode.tasks.fetchTasks();
+            const tasks = (await vscode.tasks.fetchTasks({ type: "swift" })) as SwiftTask[];
             const tasksChanged =
                 tasks.length !== this.previousTasks.length ||
                 tasks.some((task, i) => {
                     const prev = this.previousTasks[i];
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    const c1 = (task.execution as any).command;
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    const c2 = (prev.execution as any).command;
+                    const c1 = task.execution.command;
+                    const c2 = prev.execution.command;
                     return (
                         !prev ||
                         task.name !== prev.name ||

src/utilities/tasks.ts

@@ -44,6 +44,16 @@ function getScopeWorkspaceFolder(task: vscode.Task): string | undefined {
     return;
 }
 
+export function getPlatformConfig<T>(task: vscode.Task): T | undefined {
+    if (process.platform === "win32") {
+        return task.definition.windows;
+    } else if (process.platform === "linux") {
+        return task.definition.linux;
+    } else if (process.platform === "darwin") {
+        return task.definition.macos;
+    }
+}
+
 export function checkIfBuildComplete(line: string): boolean {
     // Output in this format for "build" and "test" commands
     const completeRegex = /^Build complete!/gm;