github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5678 from as-cii/faster-merge-selection

Browse Source 
Faster `mergeIntersectingSelections`
This commit is contained in:
Nathan Sobo
2015-02-23 12:36:28 -08:00
parent 2e8c5855d4 7fe3135526
commit c74ced6378
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/text-editor.coffee
View File

@@ -2207,18 +2207,18 @@ class TextEditor extends Model
@suppressSelectionMerging = false
reducer = (disjointSelections, selection) ->
intersectingSelection = _.find disjointSelections, (otherSelection) ->
exclusive = not selection.isEmpty() and not otherSelection.isEmpty()
intersects = otherSelection.intersectsWith(selection, exclusive)
intersects
adjacentSelection = _.last(disjointSelections)
exclusive = not selection.isEmpty() and not adjacentSelection.isEmpty()
intersects = adjacentSelection.intersectsWith(selection, exclusive)
if intersectingSelection?
intersectingSelection.merge(selection, options)
if intersects
adjacentSelection.merge(selection, options)
disjointSelections
else
disjointSelections.concat([selection])
_.reduce(@getSelections(), reducer, [])
[head, tail...] = @getSelectionsOrderedByBufferPosition()
_.reduce(tail, reducer, [head])
# Add a {Selection} based on the given {Marker}.
#