Only have one instance of the plugin provider (#1540)

Seems to be causing test failures because a different instance of the
provider is used to resolve

Author: award999

src/WorkspaceContext.ts

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

src/commands/runTask.ts

@@ -15,7 +15,6 @@
 import * as vscode from "vscode";
 import { WorkspaceContext } from "../WorkspaceContext";
 import { TaskOperation } from "../tasks/TaskQueue";
-import { SwiftPluginTaskProvider } from "../tasks/SwiftPluginTaskProvider";
 
 export const runTask = async (ctx: WorkspaceContext, name: string) => {
     if (!ctx.currentFolder) {
@@ -25,7 +24,7 @@ export const runTask = async (ctx: WorkspaceContext, name: string) => {
     const tasks = await vscode.tasks.fetchTasks();
     let task = tasks.find(task => task.name === name);
     if (!task) {
-        const pluginTaskProvider = new SwiftPluginTaskProvider(ctx);
+        const pluginTaskProvider = ctx.pluginProvider;
         const pluginTasks = await pluginTaskProvider.provideTasks(
             new vscode.CancellationTokenSource().token
         );

src/extension.ts

@@ -25,7 +25,6 @@ import { FolderContext } from "./FolderContext";
 import { TestExplorer } from "./TestExplorer/TestExplorer";
 import { LanguageStatusItems } from "./ui/LanguageStatusItems";
 import { getErrorDescription } from "./utilities/utilities";
-import { SwiftPluginTaskProvider } from "./tasks/SwiftPluginTaskProvider";
 import { Version } from "./utilities/version";
 import { getReadOnlyDocumentProvider } from "./ui/ReadOnlyDocumentProvider";
 import { registerDebugger } from "./debugger/debugAdapterFactory";
@@ -100,7 +99,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         context.subscriptions.push(SwiftTaskProvider.register(workspaceContext));
 
         // Register swift plugin task provider.
-        context.subscriptions.push(SwiftPluginTaskProvider.register(workspaceContext));
+        context.subscriptions.push(
+            vscode.tasks.registerTaskProvider("swift-plugin", workspaceContext.pluginProvider)
+        );
 
         // Register the language status bar items.
         context.subscriptions.push(new LanguageStatusItems(workspaceContext));

src/tasks/SwiftPluginTaskProvider.ts

@@ -281,13 +281,4 @@ export class SwiftPluginTaskProvider implements vscode.TaskProvider {
         }
         return args;
     }
-
-    /**
-     * Registers the Swift plugin 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-plugin", new SwiftPluginTaskProvider(ctx));
-    }
 }

src/ui/ProjectPanelProvider.ts

@@ -20,7 +20,6 @@ import { WorkspaceContext } from "../WorkspaceContext";
 import { FolderOperation } from "../WorkspaceContext";
 import contextKeys from "../contextKeys";
 import { Dependency, ResolvedDependency, Target } from "../SwiftPackage";
-import { SwiftPluginTaskProvider } from "../tasks/SwiftPluginTaskProvider";
 import { FolderContext } from "../FolderContext";
 
 const LOADING_ICON = "loading~spin";
@@ -598,7 +597,7 @@ export class ProjectPanelProvider implements vscode.TreeDataProvider<TreeNode> {
     }
 
     private async commands(): Promise<TreeNode[]> {
-        const provider = new SwiftPluginTaskProvider(this.workspaceContext);
+        const provider = this.workspaceContext.pluginProvider;
         const tasks = await provider.provideTasks(new vscode.CancellationTokenSource().token);
         return tasks
             .map(

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

@@ -199,7 +199,7 @@ suite("SwiftPluginTaskProvider Test Suite", function () {
             let taskProvider: SwiftPluginTaskProvider;
 
             setup(() => {
-                taskProvider = new SwiftPluginTaskProvider(workspaceContext);
+                taskProvider = workspaceContext.pluginProvider;
             });
 
             test("Exit code on success", async () => {