Merge pull request #3 from travco/findInCurrentDir

Fix regression (error) updated in upstream, add spec in show-in-current-directory for new functionality

Author: codingbelief

README.md

@@ -1,13 +1,16 @@
-# Find and Replace package [![Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace)
+# Find and Replace package
+[![OS X Build Status](https://travis-ci.org/atom/find-and-replace.svg?branch=master)](https://travis-ci.org/atom/find-and-replace) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/6w4baiiq5mw4nxky/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/find-and-replace/branch/master) [![Dependency Status](https://david-dm.org/atom/find-and-replace.svg)](https://david-dm.org/atom/find-and-replace)
 
 Find and replace in the current buffer or across the entire project in Atom.
 
-## Find in buffer (cmd-f)
+## Find in buffer
 
+Using the shortcut <kbd>cmd-f</kbd> (Mac) or <kbd>ctrl-f</kbd> (Windows and Linux).
 ![screen shot 2013-11-26 at 12 25 22 pm](https://f.cloud.github.com/assets/69169/1625938/a859fa70-56d9-11e3-8b2a-ac37c5033159.png)
 
-## Find in project (cmd-shift-f)
+## Find in project
 
+Using the shortcut <kbd>cmd-shift-f</kbd> (Mac) or <kbd>ctrl-shift-f</kbd> (Windows and Linux).
 ![screen shot 2013-11-26 at 12 26 02 pm](https://f.cloud.github.com/assets/69169/1625945/b216d7b8-56d9-11e3-8b14-6afc33467be9.png)
 
 ## Provided Service

appveyor.yml

@@ -0,0 +1,17 @@
+version: "{build}"
+
+os: Windows Server 2012 R2
+
+install:
+  - choco install atom -y
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - "%LOCALAPPDATA%/atom/bin/apm clean"
+  - "%LOCALAPPDATA%/atom/bin/apm install"
+
+build_script:
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - "%LOCALAPPDATA%/atom/bin/apm test --path %LOCALAPPDATA%/atom/bin/atom.cmd"
+
+test: off
+
+deploy: off

lib/buffer-search.coffee

@@ -7,15 +7,12 @@ ResultsMarkerLayersByEditor = new WeakMap
 
 module.exports =
 class BufferSearch
-  @markerClass: 'find-result'
-
   constructor: (@findOptions) ->
     @emitter = new Emitter
     @patch = new Patch
     @subscriptions = null
     @markers = []
     @editor = null
-    @useMarkerLayers = false
 
     recreateMarkers = @recreateMarkers.bind(this)
     @findOptions.onDidChange (changedParams) =>
@@ -44,10 +41,9 @@ class BufferSearch
       @subscriptions.add @editor.buffer.onDidStopChanging(@bufferStoppedChanging.bind(this))
       @subscriptions.add @editor.onDidAddSelection(@setCurrentMarkerFromSelection.bind(this))
       @subscriptions.add @editor.onDidChangeSelectionRange(@setCurrentMarkerFromSelection.bind(this))
-      if @useMarkerLayers = @editor.addMarkerLayer?
-        @resultsMarkerLayer = @resultsMarkerLayerForTextEditor(@editor)
-        @resultsLayerDecoration?.destroy()
-        @resultsLayerDecoration = @editor.decorateMarkerLayer(@resultsMarkerLayer, {type: 'highlight', class: @constructor.markerClass})
+      @resultsMarkerLayer = @resultsMarkerLayerForTextEditor(@editor)
+      @resultsLayerDecoration?.destroy()
+      @resultsLayerDecoration = @editor.decorateMarkerLayer(@resultsMarkerLayer, {type: 'highlight', class: 'find-result'})
     @recreateMarkers()
 
   getEditor: -> @editor
@@ -58,7 +54,7 @@ class BufferSearch
 
   resultsMarkerLayerForTextEditor: (editor) ->
     unless layer = ResultsMarkerLayersByEditor.get(editor)
-      layer = editor.addMarkerLayer?()
+      layer = editor.addMarkerLayer({maintainHistory: false})
       ResultsMarkerLayersByEditor.set(editor, layer)
     layer
 
@@ -74,18 +70,17 @@ class BufferSearch
     @findOptions.set({replacePattern})
 
     @editor.transact =>
+      replacePattern = escapeHelper.unescapeEscapeSequence(replacePattern) if @findOptions.useRegex
       for marker in markers
         bufferRange = marker.getBufferRange()
         replacementText = null
         if @findOptions.useRegex
-          replacePattern = escapeHelper.unescapeEscapeSequence(replacePattern)
           textToReplace = @editor.getTextInBufferRange(bufferRange)
           replacementText = textToReplace.replace(@getFindPatternRegex(), replacePattern)
         @editor.setTextInBufferRange(bufferRange, replacementText ? replacePattern)
 
         marker.destroy()
         @markers.splice(@markers.indexOf(marker), 1)
-        delete @decorationsByMarkerId[marker.id] unless @useMarkerLayers
 
     @emitter.emit 'did-update', @markers.slice()
 
@@ -99,7 +94,6 @@ class BufferSearch
   recreateMarkers: ->
     @markers.forEach (marker) -> marker.destroy()
     @markers.length = 0
-    @decorationsByMarkerId = {} unless @useMarkerLayers
 
     if markers = @createMarkers(Point.ZERO, Point.INFINITY)
       @markers = markers
@@ -113,8 +107,13 @@ class BufferSearch
         end = Point.min(end, selectedRange.end)
 
       if regex = @getFindPatternRegex()
-        @editor.scanInBufferRange regex, Range(start, end), ({range}) =>
-          newMarkers.push(@createMarker(range))
+        try
+          @editor.scanInBufferRange regex, Range(start, end), ({range}) =>
+            newMarkers.push(@createMarker(range))
+        catch error
+          error.message = "Search string is too large" if /RegExp too big$/.test(error.message)
+          @emitter.emit 'did-error', error
+          return false
       else
         return false
     newMarkers
@@ -166,7 +165,6 @@ class BufferSearch
       oldMarkers = @markers.splice(spliceStart, spliceEnd - spliceStart + 1, newMarkers...)
       for oldMarker in oldMarkers
         oldMarker.destroy()
-        delete @decorationsByMarkerId[oldMarker.id] unless @useMarkerLayers
       markerIndex += newMarkers.length - oldMarkers.length
 
     while marker = @markers[++markerIndex]
@@ -185,46 +183,25 @@ class BufferSearch
     return if marker is @currentResultMarker
 
     if @currentResultMarker?
-      if @useMarkerLayers
-        @resultsLayerDecoration.setPropertiesForMarker(@currentResultMarker, null)
-      else
-        @decorationsByMarkerId[@currentResultMarker.id]?.setProperties(type: 'highlight', class: @constructor.markerClass)
+      @resultsLayerDecoration.setPropertiesForMarker(@currentResultMarker, null)
       @currentResultMarker = null
 
     if marker and not marker.isDestroyed()
-      if @useMarkerLayers
-        @resultsLayerDecoration.setPropertiesForMarker(marker, type: 'highlight', class: 'current-result')
-      else
-        @decorationsByMarkerId[marker.id]?.setProperties(type: 'highlight', class: 'current-result')
+      @resultsLayerDecoration.setPropertiesForMarker(marker, type: 'highlight', class: 'current-result')
       @currentResultMarker = marker
 
     @emitter.emit 'did-change-current-result', @currentResultMarker
 
   findMarker: (range) ->
     if @markers?.length > 0
-      (@resultsMarkerLayer ? @editor).findMarkers(
-        class: @constructor.markerClass,
-        startPosition: range.start,
-        endPosition: range.end
-      )[0]
+      @resultsMarkerLayer.findMarkers({startPosition: range.start, endPosition: range.end})[0]
 
   recreateMarker: (marker) ->
-    delete @decorationsByMarkerId[marker.id] unless @useMarkerLayers
     marker.destroy()
     @createMarker(marker.getBufferRange())
 
   createMarker: (range) ->
-    marker = (@resultsMarkerLayer ? @editor).markBufferRange(range,
-      invalidate: 'inside'
-      class: @constructor.markerClass
-      persistent: false
-      maintainHistory: false
-    )
-    unless @useMarkerLayers
-      @decorationsByMarkerId[marker.id] = @editor.decorateMarker(marker,
-        type: 'highlight',
-        class: @constructor.markerClass
-      )
+    marker = @resultsMarkerLayer.markBufferRange(range, {invalidate: 'inside'})
     marker
 
   bufferChanged: ({oldRange, newRange, newText}) ->

lib/find-view.coffee

@@ -342,15 +342,21 @@ class FindView extends View
     @descriptionLabel.html('Find in Current Buffer <span class="subtle-info-message">Close this panel with the <span class="highlight">esc</span> key</span>').removeClass('text-error')
 
   selectFirstMarkerAfterCursor: =>
-    {index, wrapped} = @firstMarkerIndexAfterCursor()
+    marker = @firstMarkerIndexAfterCursor()
+    return unless marker
+    {index, wrapped} = marker
     @selectMarkerAtIndex(index, wrapped)
 
   selectFirstMarkerStartingFromCursor: =>
-    {index, wrapped} = @firstMarkerIndexAfterCursor(true)
+    marker = @firstMarkerIndexAfterCursor(true)
+    return unless marker
+    {index, wrapped} = marker
     @selectMarkerAtIndex(index, wrapped)
 
   selectFirstMarkerBeforeCursor: =>
-    {index, wrapped} = @firstMarkerIndexBeforeCursor()
+    marker = @firstMarkerIndexBeforeCursor()
+    return unless marker
+    {index, wrapped} = marker
     @selectMarkerAtIndex(index, wrapped)
 
   firstMarkerIndexStartingFromCursor: =>
@@ -467,7 +473,9 @@ class FindView extends View
       optionButton.removeClass 'selected'
 
   anyMarkersAreSelected: =>
-    @model.getEditor().getSelectedBufferRanges().some (selectedRange) =>
+    editor = @model.getEditor()
+    return false unless editor
+    editor.getSelectedBufferRanges().some (selectedRange) =>
       @model.findMarker(selectedRange)
 
   toggleRegexOption: =>
@@ -522,6 +530,7 @@ class FindView extends View
     @wrapIcon = $(wrapIcon)
 
   showWrapIcon: (icon) ->
+    return unless atom.config.get('find-and-replace.showSearchWrapIcon')
     editor = @model.getEditor()
     return unless editor?
     editorView = atom.views.getView(editor)

lib/find.coffee

@@ -11,31 +11,6 @@ ResultsModel = require './project/results-model'
 ResultsPaneView = require './project/results-pane'
 
 module.exports =
-  config:
-    focusEditorAfterSearch:
-      type: 'boolean'
-      default: false
-      description: 'Focus the editor and select the next match when a file search is executed. If no matches are found, the editor will not be focused.'
-    openProjectFindResultsInRightPane:
-      type: 'boolean'
-      default: false
-      description: 'When a project-wide search is executed, open the results in a split pane instead of a tab in the same pane.'
-    closeFindPanelAfterSearch:
-      type: 'boolean'
-      default: false
-      title: 'Close Project Find Panel After Search'
-      description: 'Close the find panel after executing a project-wide search.'
-    scrollToResultOnLiveSearch:
-      type: 'boolean'
-      default: false
-      title: 'Scroll To Result On Live-Search (incremental find in buffer)'
-      description: 'Scroll to and select the closest match while typing in the buffer find box.'
-    liveSearchMinimumCharacters:
-      type: 'integer'
-      default: 3
-      minimum: 0
-      description: 'The minimum number of characters which need to be typed into the buffer find box before search starts matching and highlighting matches as you type.'
-
   activate: ({findOptions, findHistory, replaceHistory, pathsHistory}={}) ->
     atom.workspace.addOpener (filePath) ->
       new ResultsPaneView() if filePath is ResultsPaneView.URI
@@ -60,18 +35,11 @@ module.exports =
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'project-find:show', =>
       @createViews()
-      @findPanel.hide()
-      @projectFindPanel.show()
-      @projectFindView.focusFindElement()
+      showPanel @projectFindPanel, @findPanel, => @projectFindView.focusFindElement()
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'project-find:toggle', =>
       @createViews()
-      @findPanel.hide()
-
-      if @projectFindPanel.isVisible()
-        @projectFindPanel.hide()
-      else
-        @projectFindPanel.show()
+      togglePanel @projectFindPanel, @findPanel, => @projectFindView.focusFindElement()
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'project-find:show-in-current-directory', ({target}) =>
       @createViews()
@@ -82,33 +50,24 @@ module.exports =
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:use-selection-as-find-pattern', =>
       return if @projectFindPanel?.isVisible() or @findPanel?.isVisible()
-
       @createViews()
-      @projectFindPanel.hide()
-      @findPanel.show()
-      @findView.focusFindEditor()
+      showPanel @findPanel, @projectFindPanel, => @findView.focusFindEditor()
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:toggle', =>
       @createViews()
-      @projectFindPanel.hide()
-
-      if @findPanel.isVisible()
-        @findPanel.hide()
-      else
-        @findPanel.show()
-        @findView.focusFindEditor()
+      togglePanel @findPanel, @projectFindPanel, => @findView.focusFindEditor()
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:show', =>
       @createViews()
-      @projectFindPanel.hide()
-      @findPanel.show()
-      @findView.focusFindEditor()
+      showPanel @findPanel, @projectFindPanel, => @findView.focusFindEditor()
 
     @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:show-replace', =>
       @createViews()
-      @projectFindPanel?.hide()
-      @findPanel.show()
-      @findView.focusReplaceEditor()
+      showPanel @findPanel, @projectFindPanel, => @findView.focusReplaceEditor()
+
+    @subscriptions.add atom.commands.add 'atom-workspace', 'find-and-replace:clear-history', =>
+      @findHistory.clear()
+      @replaceHistory.clear()
 
     # Handling cancel in the workspace + code editors
     handleEditorCancel = ({target}) =>
@@ -130,6 +89,20 @@ module.exports =
         @selectNextObjects.set(editor, selectNext)
       selectNext
 
+    showPanel = (panelToShow, panelToHide, postShowAction) ->
+      panelToHide.hide()
+      panelToShow.show()
+      postShowAction?()
+
+    togglePanel = (panelToToggle, panelToHide, postToggleAction) ->
+      panelToHide.hide()
+
+      if panelToToggle.isVisible()
+        panelToToggle.hide()
+      else
+        panelToToggle.show()
+        postToggleAction?()
+
     atom.commands.add '.editor:not(.mini)',
       'find-and-replace:select-next': (event) ->
         selectNextObjectForEditorElement(this).findAndSelectNext()

lib/history.coffee

@@ -25,6 +25,10 @@ class History
     @length = @items.length
     @emitter.emit 'did-add-item', text
 
+  clear: ->
+    @items = []
+    @length = 0
+
 # Adds the ability to cycle through history
 class HistoryCycler
 

lib/project-find-view.coffee

@@ -274,8 +274,7 @@ class ProjectFindView extends View
         @model.replace(pathsPattern, replacePattern, @model.getPaths())
 
   directoryPathForElement: (element) ->
-    if element?.dataset.path
-      elementPath = element?.querySelector('[data-path]')?.dataset.path
+    elementPath = element?.dataset.path ? element?.querySelector('[data-path]')?.dataset.path
 
     # Traverse up the DOM if the element and its children don't have a path
     unless elementPath

lib/project/match-view.coffee

@@ -42,12 +42,13 @@ class MatchView extends View
       @replacementText.text('').hide()
       @matchText.removeClass('highlight-error').addClass('highlight-info')
 
-  confirm: ->
+  confirm: (options = {}) ->
     openInRightPane = atom.config.get('find-and-replace.openProjectFindResultsInRightPane')
-    options = {}
-    options = {split: 'left'} if openInRightPane
-    atom.workspace.open(@filePath, options).then (editor) =>
+    options.split = 'left' if openInRightPane
+    editorPromise = atom.workspace.open(@filePath, options)
+    editorPromise.then (editor) =>
       editor.setSelectedBufferRange(@match.range, autoscroll: true)
+    editorPromise
 
   copy: ->
     atom.clipboard.write(@match.lineText)

lib/project/result-view.coffee

@@ -80,3 +80,4 @@ class ResultView extends View
 
   confirm: ->
     @expand(not @isExpanded)
+    null