Merge pull request #465 from iterative/add-new-decorations

Update available tracked statuses

extension/src/Repository/DecorationProvider.ts

@@ -14,14 +14,22 @@ import { isStringInEnum } from '../util'
 export type DecorationState = Record<Status, Set<string>>
 
 enum Status {
+  ADDED = 'added',
   DELETED = 'deleted',
   MODIFIED = 'modified',
-  NEW = 'new',
   NOT_IN_CACHE = 'notInCache',
+  RENAMED = 'renamed',
+  STAGE_MODIFIED = 'stageModified',
   TRACKED = 'tracked'
 }
 
 export class DecorationProvider implements FileDecorationProvider {
+  private static DecorationAdded: FileDecoration = {
+    badge: 'A',
+    color: new ThemeColor('gitDecoration.addedResourceForeground'),
+    tooltip: 'DVC added'
+  }
+
   private static DecorationDeleted: FileDecoration = {
     badge: 'D',
     color: new ThemeColor('gitDecoration.deletedResourceForeground'),
@@ -34,18 +42,24 @@ export class DecorationProvider implements FileDecorationProvider {
     tooltip: 'DVC modified'
   }
 
-  private static DecorationNew: FileDecoration = {
-    badge: 'A',
-    color: new ThemeColor('gitDecoration.addedResourceForeground'),
-    tooltip: 'DVC added'
-  }
-
   private static DecorationNotInCache: FileDecoration = {
     badge: 'NC',
     color: new ThemeColor('gitDecoration.renamedResourceForeground'),
     tooltip: 'DVC not in cache'
   }
 
+  private static DecorationRenamed: FileDecoration = {
+    badge: 'R',
+    color: new ThemeColor('gitDecoration.renamedResourceForeground'),
+    tooltip: 'DVC renamed'
+  }
+
+  private static DecorationStageModified: FileDecoration = {
+    badge: 'M',
+    color: new ThemeColor('gitDecoration.stageModifiedResourceForeground'),
+    tooltip: 'DVC staged modified'
+  }
+
   private static DecorationTracked: FileDecoration = {
     tooltip: 'DVC tracked'
   }
@@ -86,9 +100,11 @@ export class DecorationProvider implements FileDecorationProvider {
   }
 
   private decorationMapping: Partial<Record<Status, FileDecoration>> = {
+    added: DecorationProvider.DecorationAdded,
     deleted: DecorationProvider.DecorationDeleted,
     modified: DecorationProvider.DecorationModified,
-    new: DecorationProvider.DecorationNew,
+    renamed: DecorationProvider.DecorationRenamed,
+    stageModified: DecorationProvider.DecorationStageModified,
     notInCache: DecorationProvider.DecorationNotInCache
   }
 

extension/src/Repository/State.ts

@@ -18,10 +18,12 @@ export class RepositoryState
 
   private dvcRoot: string
 
+  public added: Set<string> = new Set()
   public deleted: Set<string> = new Set()
   public modified: Set<string> = new Set()
-  public new: Set<string> = new Set()
   public notInCache: Set<string> = new Set()
+  public renamed: Set<string> = new Set()
+  public stageModified: Set<string> = new Set()
   public tracked: Set<string> = new Set()
   public untracked: Set<string> = new Set()
 
@@ -80,9 +82,9 @@ export class RepositoryState
   public updateStatus(statusOutput: StatusOutput) {
     const status = this.reduceToChangedOutsStatuses(statusOutput)
 
+    this.added = new Set<string>()
     this.modified = status.modified || new Set<string>()
     this.deleted = status.deleted || new Set<string>()
-    this.new = status.new || new Set<string>()
     this.notInCache = status['not in cache'] || new Set<string>()
   }
 
@@ -103,10 +105,12 @@ export class RepositoryState
 
   public getState() {
     return {
+      added: this.added,
       deleted: this.deleted,
       modified: this.modified,
-      new: this.new,
       notInCache: this.notInCache,
+      renamed: this.renamed,
+      stageModified: this.stageModified,
       tracked: this.tracked,
       untracked: this.untracked
     }

extension/src/Repository/index.test.ts

@@ -59,6 +59,7 @@ beforeEach(() => {
 describe('Repository', () => {
   const dvcRoot = resolve(__dirname, '..', '..', 'demo')
   const emptyState = new RepositoryState(dvcRoot).getState()
+  const emptySet = new Set<string>()
 
   describe('ready', () => {
     it('should wait for the state to be ready before resolving', async () => {
@@ -108,7 +109,6 @@ describe('Repository', () => {
         resolve(dvcRoot, logDir),
         resolve(dvcRoot, MNISTDataDir)
       ])
-      const emptySet = new Set()
 
       const expectedExecutionOptions = {
         cliPath: undefined,
@@ -124,10 +124,12 @@ describe('Repository', () => {
 
       expect(repository.getState()).toEqual(
         expect.objectContaining({
+          added: emptySet,
           deleted: emptySet,
           notInCache: emptySet,
-          new: emptySet,
           modified,
+          renamed: emptySet,
+          stageModified: emptySet,
           tracked,
           untracked
         })
@@ -170,8 +172,6 @@ describe('Repository', () => {
         ]
       } as unknown) as StatusOutput)
 
-      const emptySet = new Set<string>()
-
       mockedGetAllUntracked.mockResolvedValueOnce(emptySet)
 
       mockedListDvcOnlyRecursive.mockResolvedValueOnce([
@@ -211,10 +211,12 @@ describe('Repository', () => {
       )
 
       expect(repository.getState()).toEqual({
+        added: emptySet,
         deleted,
         modified: emptySet,
-        new: emptySet,
         notInCache: emptySet,
+        renamed: emptySet,
+        stageModified: emptySet,
         tracked,
         untracked: emptySet
       })
@@ -309,9 +311,11 @@ describe('Repository', () => {
       )
 
       expect(repository.getState()).toEqual({
+        added: emptySet,
         deleted,
         modified,
-        new: new Set(),
+        renamed: emptySet,
+        stageModified: emptySet,
         notInCache,
         tracked,
         untracked

extension/src/Repository/views/SourceControlManagement.test.ts

@@ -39,24 +39,24 @@ describe('SourceControlManagement', () => {
       expect(sourceControlManagement.getState()).toEqual([])
 
       const updatedState = ({
+        added: new Set(['/some/new/path']),
         deleted: new Set(['/some/deleted/path', '/some/other/deleted/path']),
         dispose: () => undefined,
-        new: new Set(['/some/new/path']),
         tracked: new Set(['/some/excluded/tracked/path'])
       } as unknown) as SourceControlManagementState
 
       sourceControlManagement.setState(updatedState)
 
       expect(sourceControlManagement.getState()).toEqual([
+        { resourceUri: Uri.file('/some/new/path'), contextValue: 'added' },
         {
           resourceUri: Uri.file('/some/deleted/path'),
           contextValue: 'deleted'
         },
         {
           resourceUri: Uri.file('/some/other/deleted/path'),
           contextValue: 'deleted'
-        },
-        { resourceUri: Uri.file('/some/new/path'), contextValue: 'new' }
+        }
       ])
 
       sourceControlManagement.setState(initialState)

extension/src/Repository/views/SourceControlManagement.ts

@@ -7,10 +7,12 @@ import { isStringInEnum } from '../../util'
 export type SourceControlManagementState = Record<Status, Set<string>>
 
 enum Status {
+  ADDED = 'added',
   DELETED = 'deleted',
   MODIFIED = 'modified',
-  NEW = 'new',
   NOT_IN_CACHE = 'notInCache',
+  RENAMED = 'renamed',
+  STAGE_MODIFIED = 'stageModified',
   UNTRACKED = 'untracked'
 }