Fix all workspaces not populating

code-asher · code-asher · commit 8a1abd80649a · 2024-10-14T16:21:41.000-08:00
Also, makes it so the initial fetch happens immediately instead of
waiting for an initial delay.
diff --git a/src/extension.ts b/src/extension.ts
@@ -51,14 +51,18 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
 
   // createTreeView, unlike registerTreeDataProvider, gives us the tree view API
   // (so we can see when it is visible) but otherwise they have the same effect.
-  const wsTree = vscode.window.createTreeView("myWorkspaces", { treeDataProvider: myWorkspacesProvider })
-  vscode.window.registerTreeDataProvider("allWorkspaces", allWorkspacesProvider)
-
-  myWorkspacesProvider.setVisibility(wsTree.visible)
-  wsTree.onDidChangeVisibility((event) => {
+  const myWsTree = vscode.window.createTreeView("myWorkspaces", { treeDataProvider: myWorkspacesProvider })
+  myWorkspacesProvider.setVisibility(myWsTree.visible)
+  myWsTree.onDidChangeVisibility((event) => {
     myWorkspacesProvider.setVisibility(event.visible)
   })
 
+  const allWsTree = vscode.window.createTreeView("allWorkspaces", { treeDataProvider: allWorkspacesProvider })
+  allWorkspacesProvider.setVisibility(allWsTree.visible)
+  allWsTree.onDidChangeVisibility((event) => {
+    allWorkspacesProvider.setVisibility(event.visible)
+  })
+
   // Handle vscode:// URIs.
   vscode.window.registerUriHandler({
     handleUri: async (uri) => {
diff --git a/src/workspacesProvider.ts b/src/workspacesProvider.ts
@@ -32,7 +32,8 @@ type AgentWatcher = {
  * abort polling until fetchAndRefresh() is called again.
  */
 export class WorkspaceProvider implements vscode.TreeDataProvider<vscode.TreeItem> {
-  private workspaces: WorkspaceTreeItem[] = []
+  // Undefined if we have never fetched workspaces before.
+  private workspaces: WorkspaceTreeItem[] | undefined
   private agentWatchers: Record<WorkspaceAgent["id"], AgentWatcher> = {}
   private timeout: NodeJS.Timeout | undefined
   private fetching = false
@@ -145,11 +146,15 @@ export class WorkspaceProvider implements vscode.TreeDataProvider<vscode.TreeIte
 
   /**
    * Either start or stop the refresh timer based on visibility.
+   *
+   * If we have never fetched workspaces and are visible, fetch immediately.
    */
   setVisibility(visible: boolean) {
     this.visible = visible
     if (!visible) {
       this.cancelPendingRefresh()
+    } else if (!this.workspaces) {
+      this.fetchAndRefresh()
     } else {
       this.maybeScheduleRefresh()
     }
@@ -207,7 +212,7 @@ export class WorkspaceProvider implements vscode.TreeDataProvider<vscode.TreeIte
 
       return Promise.resolve([])
     }
-    return Promise.resolve(this.workspaces)
+    return Promise.resolve(this.workspaces || [])
   }
 }
 
