Can move files from the tree view

Atom/src/PathWatcher.m

@@ -51,7 +51,7 @@
   _kq = kqueue();
   
   if (_kq == -1) {
-    [NSException raise:@"Could not create kqueue" format:nil];
+    [NSException raise:@"PathWatcher" format:@"Could not create kqueue"];
   }
   
   [self performSelectorInBackground:@selector(watch) withObject:NULL];
@@ -87,9 +87,14 @@
 }
 
 - (void)unwatchPath:(NSString *)path callbackId:(NSString *)callbackId {
+  path = [path stringByStandardizingPath];
+  
   @synchronized(self) {
     NSNumber *fdNumber = [_fileDescriptorsByPath objectForKey:path];
-    if (!fdNumber) return;    
+    if (!fdNumber) {
+      [NSException raise:@"PathWatcher" format:@"Trying to unwatch %@, which we aren't watching"];
+      return;    
+    }
 
     NSMutableDictionary *callbacks = [_callbacksByFileDescriptor objectForKey:fdNumber];
     if (!callbacks) return; 
@@ -106,6 +111,9 @@
       [_fileDescriptorsByPath removeObjectForKey:path];
       [_callbacksByFileDescriptor removeObjectForKey:fdNumber];
     }
+    else {
+      printf("WTF\n");
+    }
   }
 }
 
@@ -137,7 +145,7 @@
       int numberOfEvents = kevent(_kq, NULL, 0, &event, 1, &timeout);
       
       if (numberOfEvents < 0) {
-        [NSException raise:@"KQueue Error" format:@"error %d", numberOfEvents, nil];
+        [NSException raise:@"PathWatcher" format:@"error %d", numberOfEvents, nil];
       }
       if (numberOfEvents == 0) {
         continue;

Atom/src/native_handler.mm

@@ -13,7 +13,7 @@ NSString *stringFromCefV8Value(const CefRefPtr<CefV8Value>& value) {
 NativeHandler::NativeHandler() : CefV8Handler() {  
   m_object = CefV8Value::CreateObject(NULL);
   
-  const char *functionNames[] = {"exists", "read", "write", "absolute", "list", "isFile", "isDirectory", "remove", "asyncList", "open", "openDialog", "quit", "writeToPasteboard", "readFromPasteboard", "showDevTools", "newWindow", "saveDialog", "exit", "watchPath", "unwatchPath", "makeDirectory"};
+  const char *functionNames[] = {"exists", "read", "write", "absolute", "list", "isFile", "isDirectory", "remove", "asyncList", "open", "openDialog", "quit", "writeToPasteboard", "readFromPasteboard", "showDevTools", "newWindow", "saveDialog", "exit", "watchPath", "unwatchPath", "makeDirectory", "move"};
   NSUInteger arrayLength = sizeof(functionNames) / sizeof(const char *);
   for (NSUInteger i = 0; i < arrayLength; i++) {
     const char *functionName = functionNames[i];
@@ -319,6 +319,20 @@ bool NativeHandler::Execute(const CefString& name,
     }
 
     return true;
+  } 
+  else if (name == "move") {
+    NSString *sourcePath = stringFromCefV8Value(arguments[0]);
+    NSString *targetPath = stringFromCefV8Value(arguments[1]);
+    NSFileManager *fm = [NSFileManager defaultManager];
+    
+    NSError *error = nil;
+    [fm moveItemAtPath:sourcePath toPath:targetPath error:&error];
+    
+    if (error) {
+      exception = [[error localizedDescription] UTF8String];
+    }
+    
+    return true;    
   }
   
   return false;

benchmark/benchmark-helper.coffee

@@ -37,7 +37,6 @@ window.benchmark = (description, fn, profile=false, focused=false) ->
 
     fullname = @getFullName().replace(/\s|\.$/g, "")
     report = "#{fullname}: #{total} / #{count} = #{avg}ms"
-    console.log report
 
     if atom.headless
       url = "https://github.com/_stats"

spec/extensions/tree-view-spec.coffee

@@ -4,27 +4,27 @@ Directory = require 'directory'
 fs = require 'fs'
 
 describe "TreeView", ->
-  [rootView, project, treeView, rootDirectoryView, sampleJs, sampleTxt] = []
+  [rootView, project, treeView, sampleJs, sampleTxt] = []
 
   beforeEach ->
     rootView = new RootView(pathToOpen: require.resolve('fixtures/'))
     project = rootView.project
     treeView = new TreeView(rootView)
-    rootDirectoryView = treeView.find('> li:first').view()
+    treeView.root = treeView.find('> li:first').view()
     sampleJs = treeView.find('.file:contains(sample.js)')
     sampleTxt = treeView.find('.file:contains(sample.txt)')
 
-    expect(rootDirectoryView.directory.subscriptionCount()).toBeGreaterThan 0
+    expect(treeView.root.directory.subscriptionCount()).toBeGreaterThan 0
 
   afterEach ->
     treeView.deactivate()
 
   describe ".initialize(project)", ->
     it "renders the root of the project and its contents alphabetically with subdirectories first in a collapsed state", ->
-      expect(rootDirectoryView.find('> .header .disclosure-arrow')).toHaveText('▾')
-      expect(rootDirectoryView.find('> .header .name')).toHaveText('fixtures/')
+      expect(treeView.root.find('> .header .disclosure-arrow')).toHaveText('▾')
+      expect(treeView.root.find('> .header .name')).toHaveText('fixtures/')
 
-      rootEntries = rootDirectoryView.find('.entries')
+      rootEntries = treeView.root.find('.entries')
       subdir1 = rootEntries.find('> li:eq(0)')
       expect(subdir1.find('.disclosure-arrow')).toHaveText('▸')
       expect(subdir1.find('.name')).toHaveText('dir/')
@@ -40,7 +40,7 @@ describe "TreeView", ->
 
   describe "when a directory's disclosure arrow is clicked", ->
     it "expands / collapses the associated directory", ->
-      subdir = rootDirectoryView.find('.entries > li:contains(dir/)').view()
+      subdir = treeView.root.find('.entries > li:contains(dir/)').view()
 
       expect(subdir.disclosureArrow).toHaveText('▸')
       expect(subdir.find('.entries')).not.toExist()
@@ -55,36 +55,36 @@ describe "TreeView", ->
       expect(subdir.find('.entries')).not.toExist()
 
     it "restores the expansion state of descendant directories", ->
-      child = rootDirectoryView.find('.entries > li:contains(dir/)').view()
+      child = treeView.root.find('.entries > li:contains(dir/)').view()
       child.disclosureArrow.click()
 
       grandchild = child.find('.entries > li:contains(a-dir/)').view()
       grandchild.disclosureArrow.click()
 
-      rootDirectoryView.disclosureArrow.click()
-      expect(rootDirectoryView.find('.entries')).not.toExist()
-      rootDirectoryView.disclosureArrow.click()
+      treeView.root.disclosureArrow.click()
+      expect(treeView.root.find('.entries')).not.toExist()
+      treeView.root.disclosureArrow.click()
 
       # previously expanded descendants remain expanded
-      expect(rootDirectoryView.find('> .entries > li:contains(dir/) > .entries > li:contains(a-dir/) > .entries').length).toBe 1
+      expect(treeView.root.find('> .entries > li:contains(dir/) > .entries > li:contains(a-dir/) > .entries').length).toBe 1
 
       # collapsed descendants remain collapsed
-      expect(rootDirectoryView.find('> .entries > li.contains(zed/) > .entries')).not.toExist()
+      expect(treeView.root.find('> .entries > li.contains(zed/) > .entries')).not.toExist()
 
     it "when collapsing a directory, removes change subscriptions from the collapsed directory and its descendants", ->
-      child = rootDirectoryView.entries.find('li:contains(dir/)').view()
+      child = treeView.root.entries.find('li:contains(dir/)').view()
       child.disclosureArrow.click()
 
       grandchild = child.entries.find('li:contains(a-dir/)').view()
       grandchild.disclosureArrow.click()
 
-      expect(rootDirectoryView.directory.subscriptionCount()).toBe 1
+      expect(treeView.root.directory.subscriptionCount()).toBe 1
       expect(child.directory.subscriptionCount()).toBe 1
       expect(grandchild.directory.subscriptionCount()).toBe 1
 
-      rootDirectoryView.disclosureArrow.click()
+      treeView.root.disclosureArrow.click()
 
-      expect(rootDirectoryView.directory.subscriptionCount()).toBe 0
+      expect(treeView.root.directory.subscriptionCount()).toBe 0
       expect(child.directory.subscriptionCount()).toBe 0
       expect(grandchild.directory.subscriptionCount()).toBe 0
 
@@ -103,7 +103,7 @@ describe "TreeView", ->
 
   describe "when a directory is clicked", ->
     it "is selected", ->
-      subdir = rootDirectoryView.find('.directory:first').view()
+      subdir = treeView.root.find('.directory:first').view()
       subdir.click()
       expect(subdir).toHaveClass 'selected'
 
@@ -134,17 +134,17 @@ describe "TreeView", ->
       describe "when nothing is selected", ->
         it "selects the first entry", ->
           treeView.trigger 'move-down'
-          expect(rootDirectoryView).toHaveClass 'selected'
+          expect(treeView.root).toHaveClass 'selected'
 
       describe "when a collapsed directory is selected", ->
         it "skips to the next directory", ->
-          rootDirectoryView.find('.directory:eq(0)').click()
+          treeView.root.find('.directory:eq(0)').click()
           treeView.trigger 'move-down'
-          expect(rootDirectoryView.find('.directory:eq(1)')).toHaveClass 'selected'
+          expect(treeView.root.find('.directory:eq(1)')).toHaveClass 'selected'
 
       describe "when an expanded directory is selected", ->
         it "selects the first entry of the directory", ->
-          subdir = rootDirectoryView.find('.directory:eq(1)').view()
+          subdir = treeView.root.find('.directory:eq(1)').view()
           subdir.expand()
           subdir.click()
 
@@ -154,17 +154,17 @@ describe "TreeView", ->
 
       describe "when the last entry of an expanded directory is selected", ->
         it "selects the entry after its parent directory", ->
-          subdir1 = rootDirectoryView.find('.directory:eq(1)').view()
+          subdir1 = treeView.root.find('.directory:eq(1)').view()
           subdir1.expand()
           subdir1.entries.find('.entry:last').click()
 
           treeView.trigger 'move-down'
 
-          expect(rootDirectoryView.find('.entries > .entry:eq(2)')).toHaveClass 'selected'
+          expect(treeView.root.find('.entries > .entry:eq(2)')).toHaveClass 'selected'
 
       describe "when the last entry of the last directory is selected", ->
         it "does not change the selection", ->
-          lastEntry = rootDirectoryView.find('> .entries .entry:last')
+          lastEntry = treeView.root.find('> .entries .entry:last')
           lastEntry.click()
 
           treeView.trigger 'move-down'
@@ -175,11 +175,11 @@ describe "TreeView", ->
       describe "when nothing is selected", ->
         it "selects the last entry", ->
           treeView.trigger 'move-up'
-          expect(rootDirectoryView.find('.entry:last')).toHaveClass 'selected'
+          expect(treeView.root.find('.entry:last')).toHaveClass 'selected'
 
       describe "when there is an entry before the currently selected entry", ->
         it "selects the previous entry", ->
-          lastEntry = rootDirectoryView.find('.entry:last')
+          lastEntry = treeView.root.find('.entry:last')
           lastEntry.click()
 
           treeView.trigger 'move-up'
@@ -188,7 +188,7 @@ describe "TreeView", ->
 
       describe "when there is no entry before the currently selected entry, but there is a parent directory", ->
         it "selects the parent directory", ->
-          subdir = rootDirectoryView.find('.directory:first').view()
+          subdir = treeView.root.find('.directory:first').view()
           subdir.expand()
           subdir.find('> .entries > .entry:first').click()
 
@@ -199,14 +199,14 @@ describe "TreeView", ->
 
       describe "when there is no parent directory or previous entry", ->
         it "does not change the selection", ->
-          rootDirectoryView.click()
+          treeView.root.click()
           treeView.trigger 'move-up'
-          expect(rootDirectoryView).toHaveClass 'selected'
+          expect(treeView.root).toHaveClass 'selected'
 
     describe "tree-view:expand-directory", ->
       describe "when a directory entry is selected", ->
         it "expands the current directory", ->
-          subdir = rootDirectoryView.find('.directory:first')
+          subdir = treeView.root.find('.directory:first')
           subdir.click()
 
           expect(subdir).not.toHaveClass 'expanded'
@@ -215,14 +215,14 @@ describe "TreeView", ->
 
       describe "when a file entry is selected", ->
         it "does nothing", ->
-          rootDirectoryView.find('.file').click()
+          treeView.root.find('.file').click()
           treeView.trigger 'tree-view:expand-directory'
 
     describe "tree-view:collapse-directory", ->
       subdir = null
 
       beforeEach ->
-        subdir = rootDirectoryView.find('> .entries > .directory').eq(0).view()
+        subdir = treeView.root.find('> .entries > .directory').eq(0).view()
         subdir.expand()
 
       describe "when an expanded directory is selected", ->
@@ -233,7 +233,7 @@ describe "TreeView", ->
           treeView.trigger 'tree-view:collapse-directory'
 
           expect(subdir).not.toHaveClass 'expanded'
-          expect(rootDirectoryView).toHaveClass 'expanded'
+          expect(treeView.root).toHaveClass 'expanded'
 
       describe "when a collapsed directory is selected", ->
         it "collapses and selects the selected directory's parent directory", ->
@@ -242,7 +242,7 @@ describe "TreeView", ->
 
           expect(subdir).not.toHaveClass 'expanded'
           expect(subdir).toHaveClass 'selected'
-          expect(rootDirectoryView).toHaveClass 'expanded'
+          expect(treeView.root).toHaveClass 'expanded'
 
       describe "when a file is selected", ->
         it "collapses and selects the selected file's parent directory", ->
@@ -251,29 +251,29 @@ describe "TreeView", ->
 
           expect(subdir).not.toHaveClass 'expanded'
           expect(subdir).toHaveClass 'selected'
-          expect(rootDirectoryView).toHaveClass 'expanded'
+          expect(treeView.root).toHaveClass 'expanded'
 
     describe "tree-view:open-selected-entry", ->
       describe "when a file is selected", ->
         it "opens the file in the editor", ->
-          rootDirectoryView.find('.file:contains(sample.js)').click()
-          rootDirectoryView.trigger 'tree-view:open-selected-entry'
+          treeView.root.find('.file:contains(sample.js)').click()
+          treeView.root.trigger 'tree-view:open-selected-entry'
           expect(rootView.activeEditor().buffer.path).toBe require.resolve('fixtures/sample.js')
 
       describe "when a directory is selected", ->
         it "expands or collapses the directory", ->
-          subdir = rootDirectoryView.find('.directory').first()
+          subdir = treeView.root.find('.directory').first()
           subdir.click()
 
           expect(subdir).not.toHaveClass 'expanded'
-          rootDirectoryView.trigger 'tree-view:open-selected-entry'
+          treeView.root.trigger 'tree-view:open-selected-entry'
           expect(subdir).toHaveClass 'expanded'
-          rootDirectoryView.trigger 'tree-view:open-selected-entry'
+          treeView.root.trigger 'tree-view:open-selected-entry'
           expect(subdir).not.toHaveClass 'expanded'
 
       describe "when nothing is selected", ->
         it "does nothing", ->
-          rootDirectoryView.trigger 'tree-view:open-selected-entry'
+          treeView.root.trigger 'tree-view:open-selected-entry'
           expect(rootView.activeEditor()).toBeUndefined()
 
   describe "file modification", ->
@@ -283,6 +283,8 @@ describe "TreeView", ->
       treeView.deactivate()
 
       rootDirPath = "/tmp/atom-tests"
+      fs.remove(rootDirPath) if fs.exists(rootDirPath)
+
       dirPath = fs.join(rootDirPath, "test-dir")
       filePath = fs.join(dirPath, "test-file.txt")
       fs.makeDirectory(rootDirPath)
@@ -292,12 +294,13 @@ describe "TreeView", ->
       rootView = new RootView(pathToOpen: rootDirPath)
       project = rootView.project
       treeView = new TreeView(rootView)
+      treeView.root = treeView.root
       dirView = treeView.root.entries.find('.directory:contains(test-dir)').view()
       dirView.expand()
       fileElement = treeView.find('.file:contains(test-file.txt)')
 
     afterEach ->
-      fs.remove(rootDirPath)
+      fs.remove(rootDirPath) if fs.exists(rootDirPath)
 
     describe "tree-view:move", ->
       describe "when a file is selected", ->
@@ -314,13 +317,33 @@ describe "TreeView", ->
           expect(moveDialog.editor.getSelectedText()).toBe fs.base(filePath)
           expect(moveDialog.editor.isFocused).toBeTruthy()
 
+        describe "when the path is changed and confirmed", ->
+          it "moves the file, updates the tree view, and closes the dialog", ->
+            runs ->
+              newPath = fs.join(rootDirPath, 'renamed-test-file.txt')
+              moveDialog.editor.setText(newPath)
+
+              moveDialog.trigger 'tree-view:confirm'
+
+              expect(fs.exists(newPath)).toBeTruthy()
+              expect(fs.exists(filePath)).toBeFalsy()
+              expect(moveDialog.parent()).not.toExist()
+
+
+            waitsFor "tree view to update", ->
+              treeView.root.find('> .entries > .file:contains(renamed-test-file.txt)').length > 0
+
+            runs ->
+              dirView = treeView.root.entries.find('.directory:contains(test-dir)').view()
+              dirView.expand()
+              expect(dirView.entries.children().length).toBe 0
+
         describe "when the move dialog's editor loses focus", ->
           it "removes the dialog", ->
             rootView.attachToDom()
             rootView.focus()
             expect(moveDialog.parent()).not.toExist()
 
-
   describe "file system events", ->
     temporaryFilePath = null
 
@@ -339,16 +362,16 @@ describe "TreeView", ->
 
         runs ->
           expect(fs.exists(temporaryFilePath)).toBeFalsy()
-          entriesCountBefore = rootDirectoryView.entries.find('.entry').length
+          entriesCountBefore = treeView.root.entries.find('.entry').length
           fs.write temporaryFilePath, 'hi'
 
         waitsFor "directory view contens to refresh", ->
-          rootDirectoryView.entries.find('.entry').length == entriesCountBefore + 1
+          treeView.root.entries.find('.entry').length == entriesCountBefore + 1
 
         runs ->
-          expect(rootDirectoryView.entries.find('.entry').length).toBe entriesCountBefore + 1
-          expect(rootDirectoryView.entries.find('.file:contains(temporary)')).toExist()
+          expect(treeView.root.entries.find('.entry').length).toBe entriesCountBefore + 1
+          expect(treeView.root.entries.find('.file:contains(temporary)')).toExist()
           fs.remove(temporaryFilePath)
 
         waitsFor "directory view contens to refresh", ->
-          rootDirectoryView.entries.find('.entry').length == entriesCountBefore
+          treeView.root.entries.find('.entry').length == entriesCountBefore

src/app/directory.coffee

@@ -5,7 +5,10 @@ EventEmitter = require 'event-emitter'
 
 module.exports =
 class Directory
+  @idCounter = 0
+
   constructor: (@path) ->
+    @id = ++Directory.idCounter
 
   getName: ->
     fs.base(@path) + '/'

src/app/keymaps/tree-view.coffee

@@ -4,3 +4,5 @@ window.keymap.bindKeys '.tree-view'
   'enter': 'tree-view:open-selected-entry'
   'm': 'tree-view:move'
 
+window.keymap.bindKeys '.move-dialog .mini.editor'
+  'enter': 'tree-view:confirm'

src/extensions/tree-view.coffee

@@ -29,8 +29,7 @@ class TreeView extends View
     @rootView.on 'active-editor-path-change', => @selectActiveFile()
 
   deactivate: ->
-    @find('.expanded.directory').each ->
-      $(this).view().unwatchEntries()
+    @root.unwatchEntries()
 
   selectActiveFile: ->
     activeFilePath = @rootView.activeEditor()?.buffer.path
@@ -96,6 +95,7 @@ class DirectoryView extends View
     @disclosureArrow.on 'click', => @toggleExpansion()
 
   buildEntries: ->
+    @unwatchDescendantEntries()
     @entries?.remove()
     @entries = $$ -> @ol class: 'entries'
     for entry in @directory.getEntries()
@@ -123,7 +123,6 @@ class DirectoryView extends View
     @removeClass('expanded')
     @disclosureArrow.text('▸')
     @unwatchEntries()
-    @find('.expanded.directory').each -> $(this).view().unwatchEntries()
     @entries.remove()
     @entries = null
     @isExpanded = false
@@ -133,8 +132,13 @@ class DirectoryView extends View
       @buildEntries()
 
   unwatchEntries: ->
+    @unwatchDescendantEntries()
     @directory.off ".#{@directory.path}"
 
+  unwatchDescendantEntries: ->
+    @find('.expanded.directory').each ->
+      $(this).view().unwatchEntries()
+
   serializeEntryExpansionStates: ->
     entryStates = {}
     @entries.find('> .directory.expanded').each ->
@@ -156,12 +160,17 @@ class MoveDialog extends View
     @div class: 'move-dialog', =>
       @subview 'editor', new Editor(mini: true)
 
-  initialize: (@project, path) ->
+  initialize: (@project, @path) ->
     @editor.focus()
     @editor.on 'focusout', => @remove()
+    @on 'tree-view:confirm', => @confirm()
 
-    relativePath = @project.relativize(path)
+    relativePath = @project.relativize(@path)
     @editor.setText(relativePath)
     baseName = fs.base(path)
     range = [[0, relativePath.length - baseName.length], [0, relativePath.length]]
     @editor.setSelectionBufferRange(range)
+
+  confirm: ->
+    fs.move(@path, @project.resolve(@editor.getText()))
+    @remove()

src/stdlib/fs.coffee

@@ -53,6 +53,9 @@ module.exports =
   listTree: (path) ->
     $native.list(path, true)
 
+  move: (source, target) ->
+    $native.move(source, target)
+
   # Remove a file at the given path. Throws an error if path is not a
   # file or a symbolic link to a file.
   remove: (path) ->