Have single instance of task provider

Match setup of plugin task provider

Author: award999

src/WorkspaceContext.ts

@@ -35,6 +35,7 @@ import { DocCDocumentationRequest, ReIndexProjectRequest } from "./sourcekit-lsp
 import { TestKind } from "./TestExplorer/TestKind";
 import { isValidWorkspaceFolder, searchForPackages } from "./utilities/workspace";
 import { SwiftPluginTaskProvider } from "./tasks/SwiftPluginTaskProvider";
+import { SwiftTaskProvider } from "./tasks/SwiftTaskProvider";
 
 /**
  * Context for whole workspace. Holds array of contexts for each workspace folder
@@ -49,6 +50,7 @@ export class WorkspaceContext implements vscode.Disposable {
     public languageClientManager: LanguageClientToolchainCoordinator;
     public tasks: TaskManager;
     public diagnostics: DiagnosticsManager;
+    public taskProvider: SwiftTaskProvider;
     public pluginProvider: SwiftPluginTaskProvider;
     public subscriptions: vscode.Disposable[];
     public commentCompletionProvider: CommentCompletionProviders;
@@ -78,6 +80,7 @@ export class WorkspaceContext implements vscode.Disposable {
         this.languageClientManager = new LanguageClientToolchainCoordinator(this);
         this.tasks = new TaskManager(this);
         this.diagnostics = new DiagnosticsManager(this);
+        this.taskProvider = new SwiftTaskProvider(this);
         this.pluginProvider = new SwiftPluginTaskProvider(this);
         this.documentation = new DocumentationManager(extensionContext, this);
         this.currentDocument = null;

src/extension.ts

@@ -19,7 +19,6 @@ import * as vscode from "vscode";
 import * as commands from "./commands";
 import * as debug from "./debugger/launch";
 import { ProjectPanelProvider } from "./ui/ProjectPanelProvider";
-import { SwiftTaskProvider } from "./tasks/SwiftTaskProvider";
 import { FolderEvent, FolderOperation, WorkspaceContext } from "./WorkspaceContext";
 import { FolderContext } from "./FolderContext";
 import { TestExplorer } from "./TestExplorer/TestExplorer";
@@ -96,7 +95,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         context.subscriptions.push(new SelectedXcodeWatcher(outputChannel));
 
         // Register task provider.
-        context.subscriptions.push(SwiftTaskProvider.register(workspaceContext));
+        context.subscriptions.push(
+            vscode.tasks.registerTaskProvider("swift", workspaceContext.taskProvider)
+        );
 
         // Register swift plugin task provider.
         context.subscriptions.push(

src/tasks/SwiftTaskProvider.ts

@@ -16,10 +16,7 @@ import * as vscode from "vscode";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { FolderContext } from "../FolderContext";
 import { Product } from "../SwiftPackage";
-import configuration, {
-    ShowBuildStatusOptions,
-    substituteVariablesInString,
-} from "../configuration";
+import configuration, { ShowBuildStatusOptions } from "../configuration";
 import { swiftRuntimeEnv } from "../utilities/utilities";
 import { Version } from "../utilities/version";
 import { SwiftToolchain } from "../toolchain/toolchain";
@@ -445,9 +442,7 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
             platform = task.definition.macos;
         }
         // get args and cwd values from either platform specific block or base
-        const args = (platform?.args ?? task.definition.args ?? []).map(
-            substituteVariablesInString
-        );
+        const args = platform?.args ?? task.definition.args;
         const env = platform?.env ?? task.definition.env;
         const fullCwd = resolveTaskCwd(task, platform?.cwd ?? task.definition.cwd);
         const fullEnv = {
@@ -475,13 +470,4 @@ export class SwiftTaskProvider implements vscode.TaskProvider {
 
         return newTask;
     }
-
-    /**
-     * Registers the Swift task provider with VS Code.
-     * @param ctx The workspace context.
-     * @returns A disposable that unregisters the provider when disposed.
-     */
-    public static register(ctx: WorkspaceContext): vscode.Disposable {
-        return vscode.tasks.registerTaskProvider("swift", new SwiftTaskProvider(ctx));
-    }
 }