diff --git a/src/selection.coffee b/src/selection.coffee index 49aa2c6b1..91f942524 100644 --- a/src/selection.coffee +++ b/src/selection.coffee @@ -162,18 +162,6 @@ class Selection extends Model intersectsScreenRow: (screenRow) -> @getScreenRange().intersectsRow(screenRow) - # Public: Identifies if this selection's rows intersects with another selection's rows. - # - # * `otherSelection` A {Selection} to check against. - # - # Returns a {Boolean} - intersectsByRowWith: (otherSelection) -> - otherScreenRange = otherSelection.getScreenRange() - - @getScreenRange().intersectsRowRange( - otherScreenRange.start.row, otherScreenRange.end.row - ) - # Public: Identifies if a selection intersects with another selection. # # * `otherSelection` A {Selection} to check against. diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 6395ccc32..8936e125a 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -1026,7 +1026,7 @@ class TextEditor extends Model # Extended: Delete all lines intersecting selections. deleteLine: -> - @mergeIntersectingSelectionsByRow() + @mergeSelectionsOnSameRows() @mutateSelectedText (selection) -> selection.deleteLine() ### @@ -2054,9 +2054,9 @@ class TextEditor extends Model previousSelection.intersectsWith(currentSelection, exclusive) - mergeIntersectingSelectionsByRow: (args...) -> + mergeSelectionsOnSameRows: (args...) -> @mergeSelections args..., (previousSelection, currentSelection) -> - previousSelection.intersectsByRowWith(currentSelection) + previousSelection.intersectsScreenRowRange(currentSelection.getBufferRowRange()...) mergeSelections: (args...) -> mergePredicate = args.pop()