Set LineWrapper.maxLength based on lines width, not editor with.

Because there's a gutter now that doesn't count.

spec/atom/editor-spec.coffee

@@ -52,14 +52,19 @@ describe "Editor", ->
 
     describe "when soft-wrap is enabled", ->
       beforeEach ->
-        otherEditor = new Editor
+        otherEditor = new Editor()
+        otherEditor.setBuffer editor.buffer
         otherEditor.attachToDom()
         charWidth = otherEditor.charWidth
+        linesPositionLeft = otherEditor.linesPositionLeft()
         otherEditor.remove()
-        editor.width(charWidth * 50)
+        editor.width(charWidth * 50 + linesPositionLeft)
         editor.setSoftWrap(true)
         editor.attachToDom()
 
+
+        expect(editor.lineWrapper.maxLength).toBe 50
+
       it "wraps lines that are too long to fit within the editor's width, adjusting cursor positioning accordingly", ->
         expect(editor.lines.find('.line').length).toBe 16
         expect(editor.lines.find('.line:eq(3)').text()).toBe "    var pivot = items.shift(), current, left = [], "
@@ -85,7 +90,7 @@ describe "Editor", ->
 
       it "changes the max line length and repositions the cursor when the window size changes", ->
         editor.setCursorBufferPosition([3, 60])
-        editor.width(editor.charWidth * 40)
+        setEditorWidthInChars(editor, 40)
         $(window).trigger 'resize'
         expect(editor.lines.find('.line').length).toBe 19
         expect(editor.lines.find('.line:eq(4)').text()).toBe "left = [], right = [];"
@@ -140,6 +145,10 @@ describe "Editor", ->
       expect(editor.gutter.find('.line-number').length).toEqual 12
       expect(editor.gutter.find('.line-number:last').text()).toBe "12"
 
+    describe "when wrapping is on", ->
+      it "renders a • instead of line number for wrapped portions of lines", ->
+
+
 
   describe "cursor movement", ->
     describe ".setCursorScreenPosition({row, column})", ->
@@ -293,7 +302,7 @@ describe "Editor", ->
           editor.hScrollMargin = 5
 
         it "scrolls horizontally to keep the cursor on screen", ->
-          editor.width(charWidth * 30 + editor.lines.position().left)
+          setEditorWidthInChars(editor, 30)
 
           # moving right
           editor.setCursorScreenPosition([2, 24])
@@ -317,7 +326,7 @@ describe "Editor", ->
 
         it "reduces scroll margins when there isn't enough width to maintain them and scroll smoothly", ->
           editor.hScrollMargin = 6
-          editor.width(charWidth * 7 + editor.lines.position().left)
+          setEditorWidthInChars(editor, 7)
 
           editor.setCursorScreenPosition([2, 3])
           expect(editor.lines.scrollLeft()).toBe(0)
@@ -367,7 +376,7 @@ describe "Editor", ->
 
       describe "when soft-wrap and is enabled and code is folded", ->
         beforeEach ->
-          editor.width(editor.charWidth * 50)
+          setEditorWidthInChars(editor, 50)
           editor.setSoftWrap(true)
           editor.lineFolder.createFold(new Range([3, 3], [3, 7]))
 

spec/spec-helper.coffee

@@ -102,6 +102,9 @@ window.pagePixelPositionForPoint = (editor, point) ->
 window.tokensText = (tokens) ->
   _.pluck(tokens, 'value').join('')
 
+window.setEditorWidthInChars = (editor, widthInChars, charWidth=editor.charWidth) ->
+  editor.width(charWidth * widthInChars + editor.lines.position().left)
+
 $.fn.resultOfTrigger = (type) ->
   event = $.Event(type)
   this.trigger(event)

src/atom/editor.coffee

@@ -219,7 +219,7 @@ class Editor extends View
   setMaxLineLength: ->
     maxLength =
       if @softWrap
-        Math.floor(@width() / @charWidth)
+        Math.floor(@lines.width() / @charWidth)
       else
         Infinity