Merge pull request #1049 from atom/mkt-events-and-editor-updates

Update editors when containing directory is renamed or removed (redux)

lib/copy-dialog.coffee

@@ -5,7 +5,7 @@ Dialog = require './dialog'
 
 module.exports =
 class CopyDialog extends Dialog
-  constructor: (@initialPath) ->
+  constructor: (@initialPath, {@onCopy}) ->
     super
       prompt: 'Enter the new path for the duplicate.'
       initialPath: atom.project.relativize(@initialPath)
@@ -32,8 +32,10 @@ class CopyDialog extends Dialog
     try
       if fs.isDirectorySync(@initialPath)
         fs.copySync(@initialPath, newPath)
+        @onCopy?({initialPath: @initialPath, newPath: newPath})
       else
-        fs.copy @initialPath, newPath, ->
+        fs.copy @initialPath, newPath, =>
+          @onCopy?({initialPath: @initialPath, newPath: newPath})
           atom.workspace.open newPath,
             activatePane: true
             initialLine: activeEditor?.getLastCursor().getBufferRow()

lib/helpers.coffee

@@ -22,3 +22,10 @@ module.exports =
       fullExtension = extension + fullExtension
       filePath = path.basename(filePath, extension)
     fullExtension
+
+  updateEditorsForPath: (oldPath, newPath) ->
+    editors = atom.workspace.getTextEditors()
+    for editor in editors
+      filePath = editor.getPath()
+      if filePath?.startsWith(oldPath)
+        editor.getBuffer().setPath(filePath.replace(oldPath, newPath))

lib/move-dialog.coffee

@@ -5,7 +5,7 @@ Dialog = require './dialog'
 
 module.exports =
 class MoveDialog extends Dialog
-  constructor: (@initialPath) ->
+  constructor: (@initialPath, {@onMove}) ->
     if fs.isDirectorySync(@initialPath)
       prompt = 'Enter the new path for the directory.'
     else
@@ -36,6 +36,7 @@ class MoveDialog extends Dialog
     try
       fs.makeTreeSync(directoryPath) unless fs.existsSync(directoryPath)
       fs.moveSync(@initialPath, newPath)
+      @onMove?(initialPath: @initialPath, newPath: newPath)
       if repo = repoForPath(newPath)
         repo.getPathStatus(@initialPath)
         repo.getPathStatus(newPath)

lib/tree-view.coffee

@@ -2,8 +2,8 @@ path = require 'path'
 {shell} = require 'electron'
 
 _ = require 'underscore-plus'
-{BufferedProcess, CompositeDisposable} = require 'atom'
-{repoForPath, getStyleObject, getFullExtension} = require "./helpers"
+{BufferedProcess, CompositeDisposable, Emitter} = require 'atom'
+{repoForPath, getStyleObject, getFullExtension, updateEditorsForPath} = require "./helpers"
 fs = require 'fs-plus'
 
 AddDialog = require './add-dialog'
@@ -41,6 +41,7 @@ class TreeView
     @element.appendChild(@resizeHandle)
 
     @disposables = new CompositeDisposable
+    @emitter = new Emitter
     @focusAfterAttach = false
     @roots = []
     @scrollLeftAfterAttach = -1
@@ -73,6 +74,14 @@ class TreeView
     @element.style.width = "#{state.width}px" if state.width > 0
     @attach() if state.attached
 
+    @disposables.add @onEntryMoved ({initialPath, newPath}) ->
+      updateEditorsForPath(initialPath, newPath)
+
+    @disposables.add @onEntryDeleted ({path}) ->
+      for editor in atom.workspace.getTextEditors()
+        if editor?.getPath()?.startsWith(path)
+          editor.destroy()
+
   serialize: ->
     directoryExpansionStates: new ((roots) ->
       @[root.directory.path] = root.directory.serializeExpansionState() for root in roots
@@ -90,6 +99,21 @@ class TreeView
     @rootDragAndDrop.dispose()
     @detach() if @panel?
 
+  onDirectoryCreated: (callback) ->
+    @emitter.on('directory-created', callback)
+
+  onEntryCopied: (callback) ->
+    @emitter.on('entry-copied', callback)
+
+  onEntryDeleted: (callback) ->
+    @emitter.on('entry-deleted', callback)
+
+  onEntryMoved: (callback) ->
+    @emitter.on('entry-moved', callback)
+
+  onFileCreated: (callback) ->
+    @emitter.on('file-created', callback)
+
   handleEvents: ->
     @resizeHandle.addEventListener 'dblclick', => @resizeToFitContent()
     @resizeHandle.addEventListener 'mousedown', (e) => @resizeStarted(e)
@@ -493,7 +517,9 @@ class TreeView
       oldPath = @getActivePath()
 
     if oldPath
-      dialog = new MoveDialog(oldPath)
+      dialog = new MoveDialog oldPath,
+        onMove: ({initialPath, newPath}) =>
+          @emitter.emit 'entry-moved', {initialPath, newPath}
       dialog.attach()
 
   # Get the outline of a system call to the current platform's file manager.
@@ -580,7 +606,9 @@ class TreeView
       oldPath = @getActivePath()
     return unless oldPath
 
-    dialog = new CopyDialog(oldPath)
+    dialog = new CopyDialog oldPath,
+      onCopy: ({initialPath, newPath}) =>
+        @emitter.emit 'entry-copied', {initialPath, newPath}
     dialog.attach()
 
   removeSelectedEntries: ->
@@ -606,9 +634,7 @@ class TreeView
           failedDeletions = []
           for selectedPath in selectedPaths
             if shell.moveItemToTrash(selectedPath)
-              for editor in atom.workspace.getTextEditors()
-                if editor?.getPath() is selectedPath
-                  editor.destroy()
+              @emitter.emit 'entry-deleted', {path: selectedPath}
             else
               failedDeletions.push "#{selectedPath}"
             if repo = repoForPath(selectedPath)
@@ -698,15 +724,21 @@ class TreeView
 
           if fs.isDirectorySync(initialPath)
             # use fs.copy to copy directories since read/write will fail for directories
-            catchAndShowFileErrors -> fs.copySync(initialPath, newPath)
+            catchAndShowFileErrors =>
+              fs.copySync(initialPath, newPath)
+              @emitter.emit 'entry-copied', {initialPath, newPath}
           else
             # read the old file and write a new one at target location
-            catchAndShowFileErrors -> fs.writeFileSync(newPath, fs.readFileSync(initialPath))
+            catchAndShowFileErrors =>
+              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 exists and if the newPath
+          # Only move the target if the cut target doesn't exist and if the newPath
           # is not within the initial path
           unless fs.existsSync(newPath) or newPath.startsWith(initialPath)
-            catchAndShowFileErrors -> fs.moveSync(initialPath, newPath)
+            catchAndShowFileErrors =>
+              fs.moveSync(initialPath, newPath)
+              @emitter.emit 'entry-moved', {initialPath, newPath}
 
   add: (isCreatingFile) ->
     selectedEntry = @selectedEntry() ? @roots[0]
@@ -717,9 +749,11 @@ class TreeView
       @entryForPath(createdPath)?.reload()
       @selectEntryForPath(createdPath)
       @updateRoots() if atom.config.get('tree-view.squashDirectoryNames')
+      @emitter.emit 'directory-created', {path: createdPath}
     dialog.onDidCreateFile (createdPath) =>
       atom.workspace.open(createdPath)
       @updateRoots() if atom.config.get('tree-view.squashDirectoryNames')
+      @emitter.emit 'file-created', {path: createdPath}
     dialog.attach()
 
   removeProjectFolder: (e) ->
@@ -795,6 +829,7 @@ class TreeView
     try
       fs.makeTreeSync(newDirectoryPath) unless fs.existsSync(newDirectoryPath)
       fs.moveSync(initialPath, newPath)
+      @emitter.emit 'entry-moved', {initialPath, newPath}
 
       if repo = repoForPath(newPath)
         repo.getPathStatus(initialPath)