Merge pull request #8646

SelectLine : When multiple lines selected, complete both first and last line

spec/selection-spec.coffee

@@ -56,6 +56,19 @@ describe "Selection", ->
       selection.selectToScreenPosition([0, 25])
       expect(selection.isReversed()).toBeFalsy()
 
+  describe ".selectLine(row)", ->
+    describe "when passed a row", ->
+      it "selects the specified row", ->
+        selection.setBufferRange([[2, 4], [3, 4]])
+        selection.selectLine(5)
+        expect(selection.getBufferRange()).toEqual [[5, 0], [6, 0]]
+
+    describe "when not passed a row", ->
+      it "selects all rows spanned by the selection", ->
+        selection.setBufferRange([[2, 4], [3, 4]])
+        selection.selectLine()
+        expect(selection.getBufferRange()).toEqual [[2, 0], [4, 0]]
+
   describe "when only the selection's tail is moved (regression)", ->
     it "notifies ::onDidChangeRange observers", ->
       selection.setBufferRange([[2, 0], [2, 10]], reversed: true)

spec/text-editor-spec.coffee

@@ -1284,7 +1284,7 @@ describe "TextEditor", ->
         expect(selection2.isReversed()).toBeFalsy()
 
     describe ".selectLinesContainingCursors()", ->
-      it "selects the entire line (including newlines) at given row", ->
+      it "selects to the entire line (including newlines) at given row", ->
         editor.setCursorScreenPosition([1, 2])
         editor.selectLinesContainingCursors()
         expect(editor.getSelectedBufferRange()).toEqual [[1, 0], [2, 0]]
@@ -1299,6 +1299,13 @@ describe "TextEditor", ->
         editor.selectLinesContainingCursors()
         expect(editor.getSelectedBufferRange()).toEqual [[0, 0], [2, 0]]
 
+      describe "when the selection spans multiple row", ->
+        it "selects from the beginning of the first line to the last line", ->
+          selection = editor.getLastSelection()
+          selection.setBufferRange [[1, 10], [3, 20]]
+          editor.selectLinesContainingCursors()
+          expect(editor.getSelectedBufferRange()).toEqual [[1, 0], [4, 0]]
+
       it "autoscrolls to the selection", ->
         editor.setLineHeightInPixels(10)
         editor.setDefaultCharWidth(10)

src/selection.coffee

@@ -324,9 +324,13 @@ class Selection extends Model
   #
   # * `row` The line {Number} to select (default: the row of the cursor).
   selectLine: (row, options) ->
-    row ?= @cursor.getBufferPosition().row
-    range = @editor.bufferRangeForBufferRow(row, includeNewline: true)
-    @setBufferRange(@getBufferRange().union(range), options)
+    if row?
+      @setBufferRange(@editor.bufferRangeForBufferRow(row, includeNewline: true), options)
+    else
+      startRange = @editor.bufferRangeForBufferRow(@marker.getStartBufferPosition().row)
+      endRange = @editor.bufferRangeForBufferRow(@marker.getEndBufferPosition().row, includeNewline: true)
+      @setBufferRange(startRange.union(endRange), options)
+
     @linewise = true
     @wordwise = false
     @initialScreenRange = @getScreenRange()