Use screenPosition to select above and below

src/display-buffer.coffee

@@ -859,6 +859,18 @@ class DisplayBuffer extends Model
       column = screenLine.clipScreenColumn(column, options)
     new Point(row, column)
 
+  # Clip the start and end of the given range to valid positions on screen.
+  # See {::clipScreenPosition} for more information.
+  #
+  # * `range` The {Range} to clip.
+  # * `options` (optional) See {::clipScreenPosition} `options`.
+  # Returns a {Range}.
+  clipScreenRange: (range, options) ->
+    start = @clipScreenPosition(range.start, options)
+    end = @clipScreenPosition(range.end, options)
+
+    new Range(start, end)
+
   # Calculates a {Range} representing the start of the {TextBuffer} until the end.
   #
   # Returns a {Range}.

src/selection.coffee

@@ -183,7 +183,7 @@ class Selection extends Model
 
   # Public: Clears the selection, moving the marker to the head.
   clear: ->
-    @marker.setProperties(goalBufferRange: null)
+    @marker.setProperties(goalBufferRange: null, goalScreenRange: null)
     @marker.clearTail() unless @retainSelection
     @finalize()
 
@@ -657,38 +657,38 @@ class Selection extends Model
 
   # Public: Moves the selection down one row.
   addSelectionBelow: ->
-    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
+    range = (@getGoalScreenRange() ? @getScreenRange()).copy()
     nextRow = range.end.row + 1
 
-    for row in [nextRow..@editor.getLastBufferRow()]
+    for row in [nextRow..@editor.getLastScreenRow()]
       range.start.row = row
       range.end.row = row
-      clippedRange = @editor.clipBufferRange(range)
+      clippedRange = @editor.clipScreenRange(range)
 
       if range.isEmpty()
         continue if range.end.column > 0 and clippedRange.end.column is 0
       else
         continue if clippedRange.isEmpty()
 
-      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
+      @editor.addSelectionForScreenRange(range, goalScreenRange: range)
       break
 
   # Public: Moves the selection up one row.
   addSelectionAbove: ->
-    range = (@getGoalBufferRange() ? @getBufferRange()).copy()
+    range = (@getGoalScreenRange() ? @getScreenRange()).copy()
     previousRow = range.end.row - 1
 
     for row in [previousRow..0]
       range.start.row = row
       range.end.row = row
-      clippedRange = @editor.clipBufferRange(range)
+      clippedRange = @editor.clipScreenRange(range)
 
       if range.isEmpty()
         continue if range.end.column > 0 and clippedRange.end.column is 0
       else
         continue if clippedRange.isEmpty()
 
-      @editor.addSelectionForBufferRange(range, goalBufferRange: range)
+      @editor.addSelectionForScreenRange(range, goalScreenRange: range)
       break
 
   # Public: Combines the given selection into this selection and then destroys
@@ -767,3 +767,7 @@ class Selection extends Model
   getGoalBufferRange: ->
     if goalBufferRange = @marker.getProperties().goalBufferRange
       Range.fromObject(goalBufferRange)
+
+  getGoalScreenRange: ->
+    if goalScreenRange = @marker.getProperties().goalScreenRange
+      Range.fromObject(goalScreenRange)

src/text-editor.coffee

@@ -1275,6 +1275,14 @@ class TextEditor extends Model
   # Returns a {Point}.
   clipScreenPosition: (screenPosition, options) -> @displayBuffer.clipScreenPosition(screenPosition, options)
 
+  # Extended: Clip the start and end of the given range to valid positions on screen.
+  # See {::clipScreenPosition} for more information.
+  #
+  # * `range` The {Range} to clip.
+  # * `options` (optional) See {::clipScreenPosition} `options`.
+  # Returns a {Range}.
+  clipScreenRange: (range, options) -> @displayBuffer.clipScreenRange(range, options)
+
   ###
   Section: Decorations
   ###