From 26af0631e3473fbb910b1e7f9732c793becad58e Mon Sep 17 00:00:00 2001
From: Wang Lun <wanglun02@gmail.com>
Date: Thu, 11 Aug 2022 20:51:14 +0900
Subject: [PATCH 1/2] load taskProvider after folder is ready

---
 src/extension.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index abdb51366..42366495e 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -49,18 +49,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         // listen for workspace folder changes and active text editor changes
         workspaceContext.setupEventListeners();
 
-        // Register task provider.
-        const taskProvider = vscode.tasks.registerTaskProvider(
-            "swift",
-            new SwiftTaskProvider(workspaceContext)
-        );
-        // Register swift plugin task provider.
-        const pluginTaskProvider = vscode.tasks.registerTaskProvider(
-            "swift-plugin",
-            new SwiftPluginTaskProvider(workspaceContext)
-        );
-        commands.register(workspaceContext);
-
         const commentCompletionProvider = commentCompletion.register();
 
         const languageStatusItem = new LanguageStatusItems(workspaceContext);
@@ -108,6 +96,18 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         // setup workspace context with initial workspace folders
         workspaceContext.addWorkspaceFolders();
 
+        // Register task provider.
+        const taskProvider = vscode.tasks.registerTaskProvider(
+            "swift",
+            new SwiftTaskProvider(workspaceContext)
+        );
+        // Register swift plugin task provider.
+        const pluginTaskProvider = vscode.tasks.registerTaskProvider(
+            "swift-plugin",
+            new SwiftPluginTaskProvider(workspaceContext)
+        );
+        commands.register(workspaceContext);
+
         // Register any disposables for cleanup when the extension deactivates.
         context.subscriptions.push(
             resolvePackageObserver,

From fca76150ed33ea404e13c712d599eab25988cca9 Mon Sep 17 00:00:00 2001
From: Wang Lun <wanglun02@gmail.com>
Date: Thu, 11 Aug 2022 22:37:27 +0900
Subject: [PATCH 2/2] await folder loading

---
 src/extension.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index 42366495e..432b1a21c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -94,7 +94,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
         const testExplorerObserver = TestExplorer.observeFolders(workspaceContext);
 
         // setup workspace context with initial workspace folders
-        workspaceContext.addWorkspaceFolders();
+        await workspaceContext.addWorkspaceFolders();
 
         // Register task provider.
         const taskProvider = vscode.tasks.registerTaskProvider(