Show dvc roots in tracked tree when there is more than one project in the workspace (#1951)

Author: mattseddon

extension/src/fileSystem/tree.test.ts

@@ -82,23 +82,24 @@ describe('TrackedTreeView', () => {
       )
       trackedTreeView.initialize(mockedDvcRoots)
 
-      const getRootPathItem = (dvcRoot: string) => ({
-        dvcRoot,
-        isDirectory: true,
-        resourceUri: Uri.file(dvcRoot)
-      })
-
-      mockedGetChildren.mockImplementation(dvcRoot => [
-        getRootPathItem(dvcRoot)
-      ])
-
       const rootElements = await trackedTreeView.getChildren()
 
-      expect(rootElements).toStrictEqual(mockedDvcRoots.map(getRootPathItem))
-      expect(mockedGetRepository).toBeCalledTimes(2)
-      expect(mockedGetRepository).toBeCalledWith(dvcDemoPath)
-      expect(mockedGetRepository).toBeCalledWith(mockedOtherRoot)
-      expect(mockedGetChildren).toBeCalledTimes(2)
+      expect(rootElements).toStrictEqual([
+        {
+          dvcRoot: dvcDemoPath,
+          isDirectory: true,
+          isTracked: true,
+          resourceUri: Uri.file(dvcDemoPath)
+        },
+        {
+          dvcRoot: mockedOtherRoot,
+          isDirectory: true,
+          isTracked: true,
+          resourceUri: Uri.file(mockedOtherRoot)
+        }
+      ])
+      expect(mockedGetRepository).toBeCalledTimes(0)
+      expect(mockedGetChildren).toBeCalledTimes(0)
     })
 
     it('should return directories first in the list of root items', async () => {

extension/src/fileSystem/tree.ts

@@ -112,7 +112,7 @@ export class TrackedExplorerTree
     this.repositories.treeDataChanged.fire()
   }
 
-  private async getRootElements() {
+  private getRootElements() {
     if (!this.viewed) {
       sendViewOpenedTelemetryEvent(
         EventName.VIEWS_TRACKED_EXPLORER_TREE_OPENED,
@@ -126,11 +126,12 @@ export class TrackedExplorerTree
       return this.getRepoChildren(onlyRoot)
     }
 
-    const rootChildren = await Promise.all(
-      this.dvcRoots.map(dvcRoot => this.getRepoChildren(dvcRoot))
-    )
-
-    return rootChildren.flat()
+    return this.dvcRoots.map(dvcRoot => ({
+      dvcRoot,
+      isDirectory: true,
+      isTracked: true,
+      resourceUri: Uri.file(dvcRoot)
+    }))
   }
 
   private getDataPlaceholder({ fsPath }: { fsPath: string }): string {