refactor: removeSelectedEntriesPermanently

Author: aminya

lib/tree-view.coffee

@@ -638,6 +638,8 @@ class TreeView
       buttons: [(if shouldDeletePermanently then 'Permanently Delete ⚠️' else 'Move to Trash'), 'Cancel']
     }, (response) =>
       if response is 0 # Move to Trash
+        if shouldDeletePermanently
+          return @removeSelectedPathsPermanently(selectedPaths, selectedEntries)
         failedDeletions = []
         for selectedPath in selectedPaths
           # Don't delete entries which no longer exist. This can happen, for example, when:
@@ -647,39 +649,22 @@ class TreeView
           continue unless fs.existsSync(selectedPath)
 
           @emitter.emit 'will-delete-entry', {pathToDelete: selectedPath}
-          if shell.moveItemToTrash(selectedPath, shouldDeletePermanently)
+          if shell.moveItemToTrash(selectedPath)
             @emitter.emit 'entry-deleted', {pathToDelete: selectedPath}
           else
-            if not shouldDeletePermanently
-              @emitter.emit 'delete-entry-failed', {pathToDelete: selectedPath}
+            @emitter.emit 'delete-entry-failed', {pathToDelete: selectedPath}
             failedDeletions.push selectedPath
 
           if repo = repoForPath(selectedPath)
             repo.getPathStatus(selectedPath)
 
         if failedDeletions.length > 0
-          if shouldDeletePermanently
-            del(selectedPaths, {force: true})
-            .then( (deletedPaths) ->
-              for deletedPath in deletedPaths
-                @emitter.emit 'entry-deleted', {pathToDelete: deletedPath}
-              )
-            .catch((err) ->
-              atom.notifications.addError @formatTrashFailureMessage(failedDeletions, true),
-                description: err
-                dismissable: true
-              for selectedPath in selectedPaths
-                @emitter.emit 'delete-entry-failed', {pathToDelete: selectedPath}
-              )
-            .finally( -> @finishRemoval(selectedEntries[0]))
-          else
-            atom.notifications.addError @formatTrashFailureMessage(failedDeletions, false),
-              description: @formatTrashEnabledMessage()
-              detail: "#{failedDeletions.join('\n')}"
-              dismissable: true
+          atom.notifications.addError @formatTrashFailureMessage(failedDeletions, false),
+            description: @formatTrashEnabledMessage()
+            detail: "#{failedDeletions.join('\n')}"
+            dismissable: true
 
-        if not shouldDeletePermanently
-          @finishRemoval(selectedEntries[0])
+        @finishRemoval(selectedEntries[0])
     )
 
   formatTrashFailureMessage: (failedDeletions, shouldDeletePermanently = false) ->
@@ -699,6 +684,21 @@ class TreeView
       @selectEntry(firstSelectedEntry.closest('.directory:not(.selected)'))
     @updateRoots() if atom.config.get('tree-view.squashDirectoryNames')
 
+  removeSelectedPathsPermanently: (selectedPaths, selectedEntries) ->
+    del(selectedPaths, {force: true})
+    .then( (deletedPaths) ->
+      for deletedPath in deletedPaths
+        @emitter.emit 'entry-deleted', {pathToDelete: deletedPath}
+      )
+    .catch((err) ->
+      atom.notifications.addError @formatTrashFailureMessage(selectedPaths, true),
+        description: err
+        dismissable: true
+      for selectedPath in selectedPaths
+        @emitter.emit 'delete-entry-failed', {pathToDelete: selectedPath}
+      )
+    .finally( -> @finishRemoval(selectedEntries[0]))
+
   # Public: Copy the path of the selected entry element.
   #         Save the path in localStorage, so that copying from 2 different
   #         instances of atom works as intended