Use screen ranges consistently

This commit is contained in:
Antonio Scandurra
2015-04-07 18:08:51 +02:00
parent a244c0fa07
commit cbf499243e

View File

@@ -2056,7 +2056,9 @@ class TextEditor extends Model
mergeSelectionsOnSameRows: (args...) ->
@mergeSelections args..., (previousSelection, currentSelection) ->
previousSelection.intersectsScreenRowRange(currentSelection.getBufferRowRange()...)
screenRange = currentSelection.getScreenRange()
previousSelection.intersectsScreenRowRange(screenRange.start.row, screenRange.end.row)
mergeSelections: (args...) ->
mergePredicate = args.pop()