Merge pull request #546 from codingbelief/master

Add find in parent directory functionality

Author: lee-dohm

keymaps/find-and-replace.cson

@@ -3,6 +3,9 @@
   'cmd-f': 'find-and-replace:show'
   'cmd-alt-f': 'find-and-replace:show-replace'
 
+'atom-text-editor':
+  'alt-a': 'project-find:show-in-current-directory'
+
 '.platform-win32, .platform-linux':
   'ctrl-F': 'project-find:show'
   'ctrl-f': 'find-and-replace:show'

lib/find.coffee

@@ -45,6 +45,7 @@ module.exports =
       @createViews()
       @findPanel.hide()
       @projectFindPanel.show()
+      @projectFindView.focusFindElement()
       @projectFindView.findInCurrentlySelectedDirectory(target)
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:use-selection-as-find-pattern', =>

lib/project-find-view.coffee

@@ -282,6 +282,9 @@ class ProjectFindView extends View
         elementPath = element.dataset.path
         break if elementPath
         element = element.parentElement
+      # Use the active editor path if all elements don't have a path
+      unless elementPath
+        elementPath = atom.workspace.getActiveTextEditor()?.getPath()
 
     if fs.isFileSync(elementPath)
       require('path').dirname(elementPath)

spec/project-find-view-spec.coffee

@@ -127,6 +127,42 @@ describe 'ProjectFindView', ->
         expect(projectFindView.regexOptionButton).toHaveClass 'selected'
         expect(projectFindView.wholeWordOptionButton).toHaveClass 'selected'
 
+  describe "when project-find:show-in-current-directory is triggered with an open buffer", ->
+    editor = null
+
+    beforeEach ->
+      atom.project.setPaths([__dirname])
+      atom.commands.dispatch(workspaceElement, 'project-find:show')
+
+      waitsForPromise ->
+        activationPromise
+
+      runs ->
+        projectFindView.findEditor.setText('')
+        projectFindView.pathsEditor.setText('')
+
+      waitsForPromise ->
+        atom.workspace.open('fixtures/sample.js').then (o) -> editor = o
+
+    it "calls project-find:show, and populates both findEditor and pathsEditor when there is a selection", ->
+      editor.setSelectedBufferRange([[3, 8], [3, 13]])
+      atom.commands.dispatch(workspaceElement, 'project-find:show-in-current-directory')
+      expect(getAtomPanel()).toBeVisible()
+      expect(projectFindView.findEditor.getText()).toBe('pivot')
+      expect(projectFindView.pathsEditor.getText()).toBe('fixtures')
+
+      editor.setSelectedBufferRange([[2, 14], [2, 20]])
+      atom.commands.dispatch(workspaceElement, 'project-find:show-in-current-directory')
+      expect(getAtomPanel()).toBeVisible()
+      expect(projectFindView.findEditor.getText()).toBe('length')
+      expect(projectFindView.pathsEditor.getText()).toBe('fixtures')
+
+    it "calls project-find:show, and populates only pathsEditor when there is no selection", ->
+      atom.commands.dispatch(workspaceElement, 'project-find:show-in-current-directory')
+      expect(getAtomPanel()).toBeVisible()
+      expect(projectFindView.findEditor.getText()).toBe('')
+      expect(projectFindView.pathsEditor.getText()).toBe('fixtures')
+
   describe "when project-find:toggle is triggered", ->
     it "toggles the visibility of the ProjectFindView", ->
       atom.commands.dispatch(workspaceElement, 'project-find:toggle')