Add recursive collapse tests and refactor collapseDirectory

keymaps/tree-view.cson

@@ -62,7 +62,6 @@
   'l': 'tree-view:expand-item'
   'left': 'tree-view:collapse-directory'
   'ctrl-[': 'tree-view:collapse-directory'
-  'ctrl-r': 'tree-view:collapse-all'
   'alt-ctrl-]': 'tree-view:recursive-expand-directory'
   'alt-right': 'tree-view:recursive-expand-directory'
   'alt-ctrl-[': 'tree-view:recursive-collapse-directory'

lib/tree-view.coffee

@@ -180,6 +180,7 @@ class TreeView
      'tree-view:recursive-expand-directory': => @expandDirectory(true)
      'tree-view:collapse-directory': => @collapseDirectory()
      'tree-view:recursive-collapse-directory': => @collapseDirectory(true)
+     'tree-view:collapse-all': => @collapseDirectory(true, true)
      'tree-view:open-selected-entry': => @openSelectedEntry()
      'tree-view:open-selected-entry-right': => @openSelectedEntryRight()
      'tree-view:open-selected-entry-left': => @openSelectedEntryLeft()
@@ -197,7 +198,6 @@ class TreeView
      'tree-view:toggle-vcs-ignored-files': -> toggleConfig 'tree-view.hideVcsIgnoredFiles'
      'tree-view:toggle-ignored-names': -> toggleConfig 'tree-view.hideIgnoredNames'
      'tree-view:remove-project-folder': (e) => @removeProjectFolder(e)
-     'tree-view:collapse-all': => @collapseAll()
 
     [0..8].forEach (index) =>
       atom.commands.add @element, "tree-view:open-selected-entry-in-pane-#{index + 1}", =>
@@ -219,9 +219,6 @@ class TreeView
     @disposables.add atom.config.onDidChange 'tree-view.squashDirectoryNames', =>
       @updateRoots()
 
-  collapseAll: ->
-    root.collapse(true) for root in @roots
-
   toggle: ->
     atom.workspace.toggle(this)
 
@@ -440,11 +437,13 @@ class TreeView
     else
       directory.expand(isRecursive)
 
-  collapseDirectory: (isRecursive=false) ->
+  collapseDirectory: (isRecursive=false, allDirectories=false) ->
     selectedEntry = @selectedEntry()
     return unless selectedEntry?
 
-    if directory = selectedEntry.closest('.expanded.directory')
+    if allDirectories
+      root.collapse(true) for root in @roots
+    else if directory = $(selectedEntry).closest('.expanded.directory')[0]
       directory.collapse(isRecursive)
       @selectEntry(directory)
 

spec/tree-view-package-spec.coffee

@@ -1155,14 +1155,25 @@ describe "TreeView", ->
           expect(treeView.roots[0]).toHaveClass 'expanded'
 
     describe "tree-view:collapse-all", ->
-      it "collapses all the project directories", ->
-        expect(treeView.roots[0]).toHaveClass 'expanded'
-        expect(treeView.roots[1]).toHaveClass 'expanded'
+      expandAll = ->
+        for root in treeView.roots
+          root.expand(true)
+          children = $(root).find('.directory')
+          children.each (index, child) ->
+            expect(child).toHaveClass 'expanded'
+          expect(root).toHaveClass 'expanded'
 
-        atom.commands.dispatch(treeView.element, 'tree-view:collapse-all')
+      checkAllCollapsed = ->
+        for root in treeView.roots
+          children = $(root).find('.directory')
+          children.each (index, child) ->
+            expect(child).not.toHaveClass 'expanded'
+          expect(root).not.toHaveClass 'expanded'
 
-        expect(treeView.roots[0]).not.toHaveClass 'expanded'
-        expect(treeView.roots[1]).not.toHaveClass 'expanded'
+      it "collapses all the project directories recursively", ->
+        expandAll()
+        atom.commands.dispatch(treeView.element, 'tree-view:collapse-all')
+        checkAllCollapsed()
 
     describe "tree-view:open-selected-entry", ->
       describe "when a file is selected", ->