Remove expand-directory command and replace with expand-item

Author: kuychaco

keymaps/tree-view.cson

@@ -14,7 +14,7 @@
   'cmd-c': 'tree-view:copy'
   'cmd-x': 'tree-view:cut'
   'cmd-v': 'tree-view:paste'
-  'ctrl-f': 'tree-view:expand-directory'
+  'ctrl-f': 'tree-view:expand-item'
   'ctrl-b': 'tree-view:collapse-directory'
   'cmd-k right': 'tree-view:open-selected-entry-right'
   'cmd-k l': 'tree-view:open-selected-entry-right'
@@ -58,8 +58,8 @@
 
 '.tree-view':
   'right': 'tree-view:expand-item'
-  'ctrl-]': 'tree-view:expand-directory'
-  'l': 'tree-view:expand-directory'
+  'ctrl-]': 'tree-view:expand-item'
+  'l': 'tree-view:expand-item'
   'left': 'tree-view:collapse-directory'
   'ctrl-[': 'tree-view:collapse-directory'
   'alt-ctrl-]': 'tree-view:recursive-expand-directory'

lib/tree-view.coffee

@@ -110,7 +110,6 @@ class TreeView extends View
      'core:move-to-top': => @scrollToTop()
      'core:move-to-bottom': => @scrollToBottom()
      'tree-view:expand-item': => @openSelectedEntry(pending: true, true)
-     'tree-view:expand-directory': => @expandDirectory()
      'tree-view:recursive-expand-directory': => @expandDirectory(true)
      'tree-view:collapse-directory': => @collapseDirectory()
      'tree-view:recursive-collapse-directory': => @collapseDirectory(true)
@@ -369,7 +368,9 @@ class TreeView extends View
     @scrollToEntry(@selectedEntry())
 
   expandDirectory: (isRecursive=false) ->
-    @selectedEntry()?.expand?(isRecursive)
+    selectedEntry = @selectedEntry()
+    if selectedEntry instanceof DirectoryView
+      selectedEntry.expand(isRecursive)
 
   collapseDirectory: (isRecursive=false) ->
     selectedEntry = @selectedEntry()
@@ -383,7 +384,7 @@ class TreeView extends View
     selectedEntry = @selectedEntry()
     if selectedEntry instanceof DirectoryView
       if expandDirectory
-        @expandDirectory()
+        selectedEntry.expand()
       else
         selectedEntry.toggleExpansion()
     else if selectedEntry instanceof FileView

spec/tree-view-spec.coffee

@@ -942,25 +942,6 @@ describe "TreeView", ->
         _.times entryCount, -> atom.commands.dispatch(treeView.element, 'core:move-up')
         expect(treeView.scrollTop()).toBe 0
 
-    describe "tree-view:expand-directory", ->
-      describe "when a directory entry is selected", ->
-        it "expands the current directory", ->
-          subdir = root1.find('.directory:first')
-          subdir.click()
-          subdir[0].collapse()
-
-          expect(subdir).not.toHaveClass 'expanded'
-          atom.commands.dispatch(treeView.element, 'tree-view:expand-directory')
-          expect(subdir).toHaveClass 'expanded'
-
-      describe "when a file entry is selected", ->
-        it "does nothing", ->
-          waitsForFileToOpen ->
-            root1.find('.file').click()
-
-          runs ->
-            atom.commands.dispatch(treeView.element, 'tree-view:expand-directory')
-
     describe "tree-view:recursive-expand-directory", ->
       describe "when an collapsed root is recursively expanded", ->
         it "expands the root and all subdirectories", ->