Merge pull request #96 from atom/bo-find-changes

Small find changes

lib/find-view.coffee

@@ -128,6 +128,10 @@ class FindView extends View
     atom.workspaceView.command 'find-and-replace:replace-all', @replaceAll
 
   showFind: =>
+    unless @findEditor.getText()
+      editorView = atom.workspaceView.getActiveView()
+      @findEditor.setText(editorView.getSelectedText()) if editorView
+
     @attach() if not @hasParent()
     @findEditor.focus()
     @findEditor.selectAll()

lib/find.coffee

@@ -39,6 +39,11 @@ module.exports =
       @projectFindView.attach()
       @projectFindView.findInCurrentlySelectedDirectory($(e.target))
 
+    atom.workspaceView.command 'find-and-replace:use-selection-as-find-pattern', =>
+      return if @projectFindView.isOnDom() or @findView.isOnDom()
+      @projectFindView.detach()
+      @findView.showFind()
+
     atom.workspaceView.command 'find-and-replace:show', =>
       @projectFindView.detach()
       @findView.showFind()

lib/project-find-view.coffee

@@ -116,6 +116,11 @@ class ProjectFindView extends View
 
   attach: ->
     atom.workspaceView.vertical.append(this) unless @hasParent()
+
+    unless @findEditor.getText()
+      editorView = atom.workspaceView.getActiveView()
+      @findEditor.setText(editorView.getSelectedText()) if editorView
+
     @findEditor.focus()
     @findEditor.selectAll()
 

spec/find-view-spec.coffee

@@ -20,6 +20,19 @@ describe 'FindView', ->
       editor.trigger 'find-and-replace:show'
       expect(atom.workspaceView.find('.find-and-replace')).toExist()
 
+    it "populates the findEditor with selection when there is a selection", ->
+      editor.setSelectedBufferRange([[2, 8], [2, 13]])
+      editor.trigger 'find-and-replace:show'
+      expect(atom.workspaceView.find('.find-and-replace')).toExist()
+      expect(findView.findEditor.getText()).toBe('items')
+
+      findView.findEditor.setText('')
+
+      editor.setSelectedBufferRange([[2, 14], [2, 20]])
+      editor.trigger 'find-and-replace:show'
+      expect(atom.workspaceView.find('.find-and-replace')).toExist()
+      expect(findView.findEditor.getText()).toBe('length')
+
   describe "when FindView's replace editor is visible", ->
     it "keeps the replace editor visible when find-and-replace:show is triggered", ->
       editor.trigger 'find-and-replace:show-replace'

spec/project-find-view-spec.coffee

@@ -40,6 +40,25 @@ describe 'ProjectFindView', ->
       expect(projectFindView.find('.loading')).not.toBeVisible()
       expect(projectFindView.findEditor.getSelectedBufferRange()).toEqual [[0, 0], [0, 5]]
 
+    describe "with an open buffer", ->
+      beforeEach ->
+        projectFindView.findEditor.setText('')
+        atom.workspaceView.openSync('sample.js')
+        editor = atom.workspaceView.getActiveView()
+
+      it "populates the findEditor with selection when there is a selection", ->
+        editor.setSelectedBufferRange([[2, 8], [2, 13]])
+        atom.workspaceView.trigger 'project-find:show'
+        expect(atom.workspaceView.find('.project-find')).toExist()
+        expect(projectFindView.findEditor.getText()).toBe('items')
+
+        projectFindView.findEditor.setText('')
+
+        editor.setSelectedBufferRange([[2, 14], [2, 20]])
+        atom.workspaceView.trigger 'project-find:show'
+        expect(atom.workspaceView.find('.project-find')).toExist()
+        expect(projectFindView.findEditor.getText()).toBe('length')
+
     describe "when thethe ProjectFindView is already attached", ->
       beforeEach ->
         atom.workspaceView.trigger 'project-find:show'