Add remove as inline SCM action for added resources (#4768)

Author: mattseddon

extension/package.json

@@ -345,7 +345,7 @@
         "title": "Remove",
         "command": "dvc.removeTarget",
         "category": "DVC",
-        "icon": "$(trash)"
+        "icon": "$(discard)"
       },
       {
         "title": "Rename",
@@ -1067,6 +1067,11 @@
           "group": "inline",
           "when": "scmProvider == dvc && scmResourceGroup == untracked && dvc.commands.available && !dvc.scm.command.running"
         },
+        {
+          "command": "dvc.removeTarget",
+          "group": "inline",
+          "when": "scmProvider == dvc && scmResourceState =~ /^.*?Added$/ && dvc.commands.available && !dvc.scm.command.running"
+        },
         {
           "command": "dvc.checkoutTarget",
           "group": "inline",

extension/src/repository/model/tree.ts

@@ -234,14 +234,13 @@ export class RepositoriesTree
 
     this.internalCommands.registerExternalCliCommand<Resource>(
       RegisteredCliCommands.REMOVE_TARGET,
-      async ({ dvcRoot, resourceUri }) => {
+      ({ dvcRoot, resourceUri }) => {
         const relPath = relative(dvcRoot, this.getDataPlaceholder(resourceUri))
-        await this.internalCommands.executeCommand(
+        return this.internalCommands.executeCommand(
           AvailableCommands.REMOVE,
           dvcRoot,
           relPath
         )
-        return deleteTarget(resourceUri)
       }
     )
 

extension/src/test/suite/repository/model/tree.test.ts

@@ -14,7 +14,6 @@ import {
   workspace
 } from 'vscode'
 import { Disposable } from '../../../../extension'
-import * as Workspace from '../../../../fileSystem/workspace'
 import { DvcExecutor } from '../../../../cli/dvc/executor'
 import {
   activeTextEditorChangedEvent,
@@ -249,7 +248,6 @@ suite('Repositories Tree Test Suite', () => {
       const relPath = join('mock', 'data', 'MNIST', 'raw')
       stub(path, 'relative').returns(relPath)
 
-      const mockDeleteTarget = stub(Workspace, 'deleteTarget').resolves(true)
       const mockRemove = stub(DvcExecutor.prototype, 'remove').resolves(
         'target destroyed!'
       )
@@ -258,7 +256,6 @@ suite('Repositories Tree Test Suite', () => {
         RegisteredCliCommands.REMOVE_TARGET,
         getPathItem(relPath)
       )
-      expect(mockDeleteTarget).to.be.calledOnce
       expect(mockRemove).to.be.calledOnce
     })