Merge pull request atom#97 from tmunro/preference-search-all-panes

Add feature to search through all open panes instead of just active pane

Author: kevinsawicki

keymaps/fuzzy-finder.cson

@@ -3,15 +3,18 @@
   'cmd-p': 'fuzzy-finder:toggle-file-finder'
   'cmd-b': 'fuzzy-finder:toggle-buffer-finder'
   'cmd-B': 'fuzzy-finder:toggle-git-status-finder'
+  'shift-enter': 'fuzzy-finder:invert-confirm'
 
 '.platform-win32':
   'ctrl-t': 'fuzzy-finder:toggle-file-finder'
   'ctrl-p': 'fuzzy-finder:toggle-file-finder'
   'ctrl-b': 'fuzzy-finder:toggle-buffer-finder'
   'ctrl-B': 'fuzzy-finder:toggle-git-status-finder'
+  'shift-enter': 'fuzzy-finder:invert-confirm'
 
 '.platform-linux':
   'ctrl-t': 'fuzzy-finder:toggle-file-finder'
   'ctrl-p': 'fuzzy-finder:toggle-file-finder'
   'ctrl-b': 'fuzzy-finder:toggle-buffer-finder'
   'ctrl-B': 'fuzzy-finder:toggle-git-status-finder'
+  'shift-enter': 'fuzzy-finder:invert-confirm'

lib/fuzzy-finder-view.coffee

@@ -24,6 +24,8 @@ class FuzzyFinderView extends SelectListView
         @splitOpenPath (pane, item) -> pane.splitDown(items: [item])
       'pane:split-up': =>
         @splitOpenPath (pane, item) -> pane.splitUp(items: [item])
+      'fuzzy-finder:invert-confirm': =>
+        @confirmInvertedSelection()
 
   getFilterKey: ->
     'projectRelativePath'
@@ -61,9 +63,9 @@ class FuzzyFinderView extends SelectListView
         @div fileBasename, class: "primary-line file icon #{typeClass}", 'data-name': fileBasename, 'data-path': projectRelativePath
         @div projectRelativePath, class: 'secondary-line path no-icon'
 
-  openPath: (filePath, lineNumber) ->
+  openPath: (filePath, lineNumber, searchAllPanes) ->
     if filePath
-      atom.workspace.open(filePath).done => @moveToLine(lineNumber)
+      atom.workspace.open(filePath, searchAllPanes: searchAllPanes ).done => @moveToLine(lineNumber)
 
   moveToLine: (lineNumber=-1) ->
     return unless lineNumber >= 0
@@ -100,9 +102,13 @@ class FuzzyFinderView extends SelectListView
 
   confirmSelection: ->
     item = @getSelectedItem()
-    @confirmed(item)
+    @confirmed(item, atom.config.get 'fuzzy-finder.searchAllPanes')
 
-  confirmed: ({filePath}={}) ->
+  confirmInvertedSelection: ->
+    item = @getSelectedItem()
+    @confirmed(item, !atom.config.get 'fuzzy-finder.searchAllPanes')
+
+  confirmed: ({filePath}={}, searchAllPanes) ->
     if atom.workspace.getActiveTextEditor() and @isQueryALineJump()
       lineNumber = @getLineNumber()
       @cancel()
@@ -115,7 +121,7 @@ class FuzzyFinderView extends SelectListView
     else
       lineNumber = @getLineNumber()
       @cancel()
-      @openPath(filePath, lineNumber)
+      @openPath(filePath, lineNumber, searchAllPanes)
 
   isQueryALineJump: ->
     query = @filterEditorView.getModel().getText()

lib/main.coffee

@@ -3,6 +3,10 @@ module.exports =
     ignoredNames:
       type: 'array'
       default: []
+    searchAllPanes:
+      description: "Whether to search through all open panes or just the active one. Holding shift inverts this setting."
+      type: 'boolean'
+      default: false
 
   activate: (state) ->
     @active = true

spec/fuzzy-finder-spec.coffee

@@ -418,8 +418,8 @@ describe 'FuzzyFinder', ->
             expect(editor3.getPath()).toBe expectedPath
             expect(atom.views.getView(editor3)).toHaveFocus()
 
-      describe "when the active pane does not have an item for the selected path", ->
-        it "adds a new item to the active pane for the selcted path", ->
+      describe "when the active pane does not have an item for the selected path and fuzzy-finder.searchAllPanes is false", ->
+        it "adds a new item to the active pane for the selected path", ->
           dispatchCommand('toggle-buffer-finder')
 
           atom.views.getView(editor1).focus()
@@ -429,7 +429,7 @@ describe 'FuzzyFinder', ->
           expect(atom.workspace.getActiveTextEditor()).toBe editor1
 
           expectedPath = atom.project.getDirectories()[0].resolve('sample.txt')
-          bufferView.confirmed({filePath: expectedPath})
+          bufferView.confirmed({filePath: expectedPath}, atom.config.get 'fuzzy-finder.searchAllPanes')
 
           waitsFor ->
             atom.workspace.getActivePane().getItems().length is 2
@@ -446,6 +446,33 @@ describe 'FuzzyFinder', ->
             expect(editor4.getPath()).toBe expectedPath
             expect(atom.views.getView(editor4)).toHaveFocus()
 
+      describe "when the active pane does not have an item for the selected path and fuzzy-finder.searchAllPanes is true", ->
+        beforeEach ->
+          atom.config.set("fuzzy-finder.searchAllPanes", true)
+
+        it "switches to the pane with the item for the selected path", ->
+          dispatchCommand('toggle-buffer-finder')
+
+          atom.views.getView(editor1).focus()
+
+          dispatchCommand('toggle-buffer-finder')
+
+          expect(atom.workspace.getActiveTextEditor()).toBe editor1
+
+          originalPane = atom.workspace.getActivePane()
+
+          expectedPath = atom.project.getDirectories()[0].resolve('sample.txt')
+          bufferView.confirmed({filePath: expectedPath}, atom.config.get 'fuzzy-finder.searchAllPanes')
+
+          waitsFor ->
+            atom.workspace.getActiveTextEditor().getPath() is expectedPath
+
+          runs ->
+            expect(atom.workspace.panelForItem(bufferView).isVisible()).toBe false
+            expect(atom.workspace.getActivePane()).not.toBe originalPane
+            expect(atom.workspace.getActiveTextEditor()).toBe editor3
+            expect(atom.workspace.getPaneItems().length).toBe 3
+
   describe "common behavior between file and buffer finder", ->
     describe "when the fuzzy finder is cancelled", ->
       describe "when an editor is open", ->