Merge pull request #1304 from atom/wl-cut-eexist

Error when trying to cut/paste a file that already exists

Author: Winston Liu

lib/tree-view.coffee

@@ -736,15 +736,13 @@ class TreeView
               fs.writeFileSync(newPath, fs.readFileSync(initialPath))
               @emitter.emit 'entry-copied', {initialPath, newPath}
         else if cutPaths
-          # Only move the target if the cut target doesn't exist
-          unless fs.existsSync(newPath)
-            try
-              @emitter.emit 'will-move-entry', {initialPath, newPath}
-              fs.moveSync(initialPath, newPath)
-              @emitter.emit 'entry-moved', {initialPath, newPath}
-            catch error
-              @emitter.emit 'move-entry-failed', {initialPath, newPath}
-              atom.notifications.addWarning("Unable to paste paths: #{initialPaths}", detail: error.message)
+          try
+            @emitter.emit 'will-move-entry', {initialPath, newPath}
+            fs.moveSync(initialPath, newPath)
+            @emitter.emit 'entry-moved', {initialPath, newPath}
+          catch error
+            @emitter.emit 'move-entry-failed', {initialPath, newPath}
+            atom.notifications.addWarning("Unable to paste paths: #{initialPaths}", detail: error.message)
 
   add: (isCreatingFile) ->
     selectedEntry = @selectedEntry() ? @roots[0]

spec/tree-view-package-spec.coffee

@@ -1845,7 +1845,7 @@ describe "TreeView", ->
             expect(callback).toHaveBeenCalledWith({initialPath: filePath, newPath})
 
           describe 'when the target destination file exists', ->
-            it 'does not move the cut file', ->
+            it 'emits a warning and does not move the cut file', ->
               callback = jasmine.createSpy("onEntryMoved")
               treeView.onEntryMoved(callback)
 
@@ -1858,6 +1858,9 @@ describe "TreeView", ->
               expect(fs.existsSync(filePath)).toBeTruthy()
               expect(callback).not.toHaveBeenCalled()
 
+              expect(atom.notifications.getNotifications().length).toBe(1)
+              expect(atom.notifications.getNotifications()[0].getMessage()).toContain('Unable to paste')
+
           describe 'when the file is currently open', ->
             beforeEach ->
               waitForWorkspaceOpenEvent ->