From 7d98fc141f064e8ff9adade0f0daee3f9e090c60 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 11 Aug 2015 15:33:25 -0600
Subject: [PATCH] Operate on selection objects, not just ranges

---
 src/text-editor.coffee | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 745f5c23e..2355587e2 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -822,26 +822,27 @@ class TextEditor extends Model
   # coordinates.
   moveLineUp: ->
     newSelectionBufferRanges = []
-    selections = @getSelectedBufferRanges()
-    selections.sort (a, b) -> a.compare(b)
+    selections = @getSelectionsOrderedByBufferPosition()
 
-    if selections[0].start.row is 0
+    if selections[0].getBufferRange().start.row is 0
       return
 
-    if selections[selections.length - 1].start.row is @getLastBufferRow() and @buffer.getLastLine() is ''
+    if selections[selections.length - 1].getBufferRange().start.row is @getLastBufferRow() and @buffer.getLastLine() is ''
       return
 
     @transact =>
       for selection in selections
-        foldedRows = []
-        rows = [selection.start.row..selection.end.row]
-        if selection.start.row isnt selection.end.row and selection.end.column is 0
-          rows.pop() unless @isFoldedAtBufferRow(selection.end.row)
+        selectionRange = selection.getBufferRange()
 
-        # Move line around the fold that is directly above the selection
-        precedingScreenRow = @screenRowForBufferRow(selection.start.row) - 1
+        foldedRows = []
+        rows = [selectionRange.start.row..selectionRange.end.row]
+        if selectionRange.start.row isnt selectionRange.end.row and selectionRange.end.column is 0
+          rows.pop() unless @isFoldedAtBufferRow(selectionRange.end.row)
+
+        # Move line around the fold that is directly above the selectionRange
+        precedingScreenRow = @screenRowForBufferRow(selectionRange.start.row) - 1
         precedingBufferRow = @bufferRowForScreenRow(precedingScreenRow)
-        insertDelta = selection.start.row - precedingBufferRow
+        insertDelta = selectionRange.start.row - precedingBufferRow
 
         for row in rows
           if fold = @displayBuffer.largestFoldStartingAtBufferRow(row)
@@ -871,7 +872,7 @@ class TextEditor extends Model
         for foldedRow in foldedRows when 0 <= foldedRow <= @getLastBufferRow()
           @foldBufferRow(foldedRow)
 
-        newSelectionBufferRanges.push(selection.translate([-insertDelta]))
+        newSelectionBufferRanges.push(selectionRange.translate([-insertDelta]))
 
       @setSelectedBufferRanges(newSelectionBufferRanges, preserveFolds: true, autoscroll: true)