Fix missing tracked decorations (#3801)

Author: mattseddon

extension/src/repository/model/collect.test.ts

@@ -251,6 +251,55 @@ describe('collectDataStatus', () => {
       makeAbsPathSet(dvcDemoPath, rawDataDir)
     )
   })
+
+  it('should fill in the gaps for tracked decorations', () => {
+    const data = {
+      not_in_remote: [
+        join('static', 'uploads', 'images', '2019-12-14', 'devsprints.png')
+      ],
+      unchanged: [
+        join('static', 'uploads', 'images', '2019-09-26', 'dvc-org.png')
+      ],
+      uncommitted: {
+        added: [
+          join(
+            'static',
+            'uploads',
+            'images',
+            '2017-05-15',
+            '20190925_181739.jpg'
+          )
+        ],
+        modified: [join('static', 'uploads') + sep]
+      }
+    }
+    const collected = collectDataStatus(dvcDemoPath, data)
+
+    expect(
+      collected.trackedDecorations.has(
+        join(
+          dvcDemoPath,
+          'static',
+          'uploads',
+          'images',
+          '2019-09-26',
+          'dvc-org.png'
+        )
+      )
+    ).toBe(true)
+
+    expect(
+      collected.trackedDecorations.has(
+        join(dvcDemoPath, 'static', 'uploads', 'images')
+      )
+    ).toBe(true)
+
+    expect(
+      collected.trackedDecorations.has(
+        join(dvcDemoPath, 'static', 'uploads', 'images', '2019-09-26')
+      )
+    ).toBe(true)
+  })
 })
 
 const makeUri = (...paths: string[]): Uri =>

extension/src/repository/model/collect.ts

@@ -1,4 +1,4 @@
-import { join, relative, resolve } from 'path'
+import { join, relative, resolve, sep } from 'path'
 import { Uri } from 'vscode'
 import { Resource } from '../commands'
 import { addToMapSet } from '../../util/map'
@@ -195,6 +195,33 @@ const uncommitNotInCache = (
   return ('un' + status) as ExtendedStatus
 }
 
+const collectMissingTracked = (
+  trackedDecorations: Set<String>,
+  path: string,
+  add: boolean
+) => {
+  if (add) {
+    trackedDecorations.add(path)
+  }
+}
+
+const fillGapsInTrackedDecorations = (
+  rootDepth: number,
+  trackedDecorations: Set<string>
+) => {
+  for (const path of trackedDecorations) {
+    const pathArray = getPathArray(path)
+    let add = false
+    for (let idx = rootDepth; idx < pathArray.length; idx++) {
+      const currPath = getPath(pathArray, idx)
+      if (trackedDecorations.has(currPath)) {
+        add = true
+      }
+      collectMissingTracked(trackedDecorations, currPath, add)
+    }
+  }
+}
+
 const collectGroupWithMissingAncestors = (
   acc: DataStatusAccumulator,
   dvcRoot: string,
@@ -214,6 +241,11 @@ const collectGroupWithMissingAncestors = (
 
     addToTracked(acc.trackedDecorations, absPath, originalStatus)
   }
+
+  fillGapsInTrackedDecorations(
+    dvcRoot.split(sep).length + 1,
+    acc.trackedDecorations
+  )
 }
 
 export const collectDataStatus = (