Move specs for selectUp/Down/Left/Right w/ multiple selections

2026-04-06 03:02:13 -04:00 · 2012-06-12 10:25:42 -06:00
parent 5f263e63f0
commit 727e9b8156
2 changed files with 50 additions and 96 deletions
--- a/spec/app/edit-session-spec.coffee
+++ b/spec/app/edit-session-spec.coffee
@@ -247,37 +247,62 @@ describe "EditSession", ->
      selection = editSession.getSelection()

    describe ".selectUp/Down/Left/Right()", ->
-      it "expands the selection to the cursor's new location", ->
-        editSession.setCursorScreenPosition(row: 1, column: 6)
-
-        expect(selection.isEmpty()).toBeTruthy()
+      it "expands each selection to its cursor's new location", ->
+        editSession.setSelectedBufferRanges([[[0,9], [0,13]], [[3,16], [3,21]]])
+        [selection1, selection2] = editSession.getSelections()

        editSession.selectRight()
-
-        expect(selection.isEmpty()).toBeFalsy()
-        range = selection.getScreenRange()
-        expect(range.start).toEqual(row: 1, column: 6)
-        expect(range.end).toEqual(row: 1, column: 7)
-
-        editSession.selectRight()
-        range = selection.getScreenRange()
-        expect(range.start).toEqual(row: 1, column: 6)
-        expect(range.end).toEqual(row: 1, column: 8)
-
-        editSession.selectDown()
-        range = selection.getScreenRange()
-        expect(range.start).toEqual(row: 1, column: 6)
-        expect(range.end).toEqual(row: 2, column: 8)
+        expect(selection1.getBufferRange()).toEqual [[0,9], [0,14]]
+        expect(selection2.getBufferRange()).toEqual [[3,16], [3,22]]

        editSession.selectLeft()
-        range = selection.getScreenRange()
-        expect(range.start).toEqual(row: 1, column: 6)
-        expect(range.end).toEqual(row: 2, column: 7)
+        editSession.selectLeft()
+        expect(selection1.getBufferRange()).toEqual [[0,9], [0,12]]
+        expect(selection2.getBufferRange()).toEqual [[3,16], [3,20]]
+
+        editSession.selectDown()
+        expect(selection1.getBufferRange()).toEqual [[0,9], [1,12]]
+        expect(selection2.getBufferRange()).toEqual [[3,16], [4,20]]

        editSession.selectUp()
-        range = selection.getScreenRange()
-        expect(range.start).toEqual(row: 1, column: 6)
-        expect(range.end).toEqual(row: 1, column: 7)
+        expect(selection1.getBufferRange()).toEqual [[0,9], [0,12]]
+        expect(selection2.getBufferRange()).toEqual [[3,16], [3,20]]
+
+      it "merges selections when they intersect when moving down", ->
+        editSession.setSelectedBufferRanges([[[0,9], [0,13]], [[1,10], [1,20]], [[2,15], [3,25]]])
+        [selection1, selection2, selection3] = editSession.getSelections()
+
+        editSession.selectDown()
+        expect(editSession.getSelections()).toEqual [selection1]
+        expect(selection1.getScreenRange()).toEqual([[0, 9], [4, 25]])
+        expect(selection1.isReversed()).toBeFalsy()
+
+      it "merges selections when they intersect when moving up", ->
+        editSession.setSelectedBufferRanges([[[0,9], [0,13]], [[1,10], [1,20]]], reverse: true)
+        [selection1, selection2] = editSession.getSelections()
+
+        editSession.selectUp()
+        expect(editSession.getSelections()).toEqual [selection1]
+        expect(selection1.getScreenRange()).toEqual([[0, 0], [1, 20]])
+        expect(selection1.isReversed()).toBeTruthy()
+
+      it "merges selections when they intersect when moving left", ->
+        editSession.setSelectedBufferRanges([[[0,9], [0,13]], [[0,14], [1,20]]], reverse: true)
+        [selection1, selection2] = editSession.getSelections()
+
+        editSession.selectLeft()
+        expect(editSession.getSelections()).toEqual [selection1]
+        expect(selection1.getScreenRange()).toEqual([[0, 8], [1, 20]])
+        expect(selection1.isReversed()).toBeTruthy()
+
+      it "merges selections when they intersect when moving right", ->
+        editSession.setSelectedBufferRanges([[[0,9], [0,13]], [[0,14], [1,20]]])
+        [selection1, selection2] = editSession.getSelections()
+
+        editSession.selectRight()
+        expect(editSession.getSelections()).toEqual [selection1]
+        expect(selection1.getScreenRange()).toEqual([[0, 9], [1, 21]])
+        expect(selection1.isReversed()).toBeFalsy()

    describe ".selectToTop()", ->
      it "selects text from cusor position to the top of the buffer", ->
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -168,13 +168,6 @@ describe "Editor", ->
      editor.insertText("def\n")
      expect(editor.lineElementForScreenRow(0).text()).toBe 'def'

-  describe ".clipScreenPosition(point)", ->
-    it "selects the nearest valid position to the given point", ->
-      expect(editor.clipScreenPosition(row: 1000, column: 0)).toEqual(row: buffer.getLastRow(), column: buffer.lineForRow(buffer.getLastRow()).length)
-      expect(editor.clipScreenPosition(row: -5, column: 0)).toEqual(row: 0, column: 0)
-      expect(editor.clipScreenPosition(row: 1, column: 10000)).toEqual(row: 1, column: buffer.lineForRow(1).length)
-      expect(editor.clipScreenPosition(row: 1, column: -5)).toEqual(row: 1, column: 0)
-
  describe ".save()", ->
    describe "when the current buffer has a path", ->
      tempFilePath = null
@@ -1375,70 +1368,6 @@ describe "Editor", ->
          expect(selection1.getScreenRange()).toEqual [[3, 10], [7, 4]]
          expect(selection1.isReversed()).toBeTruthy()

-      describe "upon moving the cursor with the arrow keys with the shift key held down", ->
-        it "resizes all selections", ->
-          editor.setSelectionBufferRange [[0,9], [0,13]]
-          editor.addSelectionForBufferRange [[3,16], [3,21]]
-          [selection1, selection2] = editor.getSelections()
-
-          editor.selectRight()
-          expect(selection1.getBufferRange()).toEqual [[0,9], [0,14]]
-          expect(selection2.getBufferRange()).toEqual [[3,16], [3,22]]
-
-          editor.selectLeft()
-          editor.selectLeft()
-          expect(selection1.getBufferRange()).toEqual [[0,9], [0,12]]
-          expect(selection2.getBufferRange()).toEqual [[3,16], [3,20]]
-
-          editor.selectDown()
-          expect(selection1.getBufferRange()).toEqual [[0,9], [1,12]]
-          expect(selection2.getBufferRange()).toEqual [[3,16], [4,20]]
-
-          editor.selectUp()
-          expect(selection1.getBufferRange()).toEqual [[0,9], [0,12]]
-          expect(selection2.getBufferRange()).toEqual [[3,16], [3,20]]
-
-        it "merges selections when they intersect when moving down", ->
-          editor.setSelectionBufferRange [[0,9], [0,13]]
-          editor.addSelectionForBufferRange [[1,10], [1,20]]
-          editor.addSelectionForBufferRange [[2,15], [3,25]]
-          [selection1, selection2, selection3] = editor.getSelections()
-
-          editor.selectDown()
-          expect(editor.getSelections()).toEqual [selection1]
-          expect(selection1.getScreenRange()).toEqual([[0, 9], [4, 25]])
-          expect(selection1.isReversed()).toBeFalsy()
-
-        it "merges selections when they intersect when moving up", ->
-          editor.setSelectionBufferRange [[0,9], [0,13]], reverse: true
-          editor.addSelectionForBufferRange [[1,10], [1,20]], reverse: true
-          [selection1, selection2] = editor.getSelections()
-
-          editor.selectUp()
-          expect(editor.getSelections()).toEqual [selection1]
-          expect(selection1.getScreenRange()).toEqual([[0, 0], [1, 20]])
-          expect(selection1.isReversed()).toBeTruthy()
-
-        it "merges selections when they intersect when moving left", ->
-          editor.setSelectionBufferRange [[0,9], [0,13]], reverse: true
-          editor.addSelectionForBufferRange [[0,14], [1,20]], reverse: true
-          [selection1, selection2] = editor.getSelections()
-
-          editor.selectLeft()
-          expect(editor.getSelections()).toEqual [selection1]
-          expect(selection1.getScreenRange()).toEqual([[0, 8], [1, 20]])
-          expect(selection1.isReversed()).toBeTruthy()
-
-        it "merges selections when they intersect when moving right", ->
-          editor.setSelectionBufferRange [[0,9], [0,13]]
-          editor.addSelectionForBufferRange [[0,14], [1,20]]
-          [selection1, selection2] = editor.getSelections()
-
-          editor.selectRight()
-          expect(editor.getSelections()).toEqual [selection1]
-          expect(selection1.getScreenRange()).toEqual([[0, 9], [1, 21]])
-          expect(selection1.isReversed()).toBeFalsy()
-
    describe "cursor merging", ->
      it "merges cursors when they overlap due to a buffer change", ->
        editor.setCursorScreenPosition([0, 0])