             [[6, 22], [6, 28]]
           ]
 
-        it "selects also soft-wrapped lines", ->
+        it "can add selections to soft-wrapped line segments", ->
           editor.setSoftWrapped(true)
-          editor.setDefaultCharWidth(10)
           editor.setEditorWidthInChars(40)
 
-          editor.setSelectedScreenRange([[6, 20], [6, 25]])
+          editor.setSelectedScreenRange([[3, 10], [3, 15]])
           editor.addSelectionBelow()
           expect(editor.getSelectedScreenRanges()).toEqual [
-            [[6, 20], [6, 25]]
-            [[7, 20], [7, 25]]
+            [[3, 10], [3, 15]]
+            [[4, 10], [4, 15]]
           ]
 
         it "takes atomic tokens into account", ->

            [[3, 22], [3, 38]]
          ]

        it "selects also soft-wrapped lines", ->
          editor.setSoftWrapped(true)
          editor.setDefaultCharWidth(10)
          editor.setEditorWidthInChars(40)

          editor.setSelectedScreenRange([[7, 20], [7, 25]])
          editor.addSelectionAbove()
          expect(editor.getSelectedScreenRanges()).toEqual [
            [[7, 20], [7, 25]]
            [[6, 20], [6, 25]]
          ]

        it "takes atomic tokens into account", ->

        describe "when lines are soft-wrapped", ->
          beforeEach ->
            editor.setSoftWrapped(true)
            editor.setEditorWidthInChars(40)

          it "skips soft-wrap indentation tokens", ->
            editor.setCursorScreenPosition([3, 0])
            editor.addSelectionBelow()

            expect(editor.getSelectedScreenRanges()).toEqual [
              [[3, 0], [3, 0]]
              [[4, 4], [4, 4]]
            ]

          it "does not skip them if they're shorter than the current column", ->
            editor.setCursorScreenPosition([3, 37])
            editor.addSelectionBelow()

            expect(editor.getSelectedScreenRanges()).toEqual [
              [[3, 37], [3, 37]]
              [[4, 26], [4, 26]]
            ]

        it "does not skip lines that are shorter than the current column", ->
