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(

test/integration-tests/tasks/SwiftTaskProvider.test.ts

@@ -17,7 +17,6 @@ import * as vscode from "vscode";
 import * as assert from "assert";
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import {
-    SwiftTaskProvider,
     createSwiftTask,
     createBuildAllTask,
     getBuildAllTask,
@@ -154,7 +153,7 @@ suite("SwiftTaskProvider Test Suite", () => {
         });
 
         test("includes product release task", async () => {
-            const taskProvider = new SwiftTaskProvider(workspaceContext);
+            const taskProvider = workspaceContext.taskProvider;
             const tasks = await taskProvider.provideTasks(
                 new vscode.CancellationTokenSource().token
             );