From 147e75ad95db21024fb79c623011e02a0495c181 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 21 Aug 2013 17:17:06 -0700
Subject: [PATCH] Use editor.softWrap config value when creating edit sessions

Closes #666
---
 spec/project-spec.coffee | 14 +++++++++++---
 src/editor.coffee        |  1 +
 src/project.coffee       |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee
index 8e12824f1..871903b70 100644
--- a/spec/project-spec.coffee
+++ b/spec/project-spec.coffee
@@ -66,10 +66,18 @@ describe "Project", ->
       Project.unregisterOpener(barOpener)
 
     describe "when passed a path that doesn't match a custom opener", ->
-      it "creates the edit session with the configured `editor.tabLength` setting", ->
+      it "creates the edit session with the configured `editor.tabLength` and `editor.softWrap` settings", ->
         config.set('editor.tabLength', 4)
-        editSession = project.open('a')
-        expect(editSession.getTabLength()).toBe 4
+        config.set('editor.softWrap', true)
+        editSession1 = project.open('a')
+        expect(editSession1.getTabLength()).toBe 4
+        expect(editSession1.getSoftWrap()).toBe true
+
+        config.set('editor.tabLength', 100)
+        config.set('editor.softWrap', false)
+        editSession2 = project.open('b')
+        expect(editSession2.getTabLength()).toBe 100
+        expect(editSession2.getSoftWrap()).toBe false
 
       describe "when given an absolute path that hasn't been opened previously", ->
         it "returns a new edit session for the given path and emits 'buffer-created' and 'edit-session-created' events", ->
diff --git a/src/editor.coffee b/src/editor.coffee
index aa1470eb2..ff7fb40f4 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -24,6 +24,7 @@ class Editor extends View
     nonWordCharacters: "./\\()\"':,.;<>~!@#$%^&*|+=[]{}`~?-"
     preferredLineLength: 80
     tabLength: 2
+    softWrap: false
 
   @nextEditorId: 1
 
diff --git a/src/project.coffee b/src/project.coffee
index 7be3eaba7..967b3e576 100644
--- a/src/project.coffee
+++ b/src/project.coffee
@@ -373,7 +373,7 @@ class Project
   defaultEditSessionOptions: ->
     tabLength: config.get('editor.tabLength')
     softTabs: @getSoftTabs()
-    softWrap: @getSoftWrap()
+    softWrap: config.get('editor.softWrap')
 
   eachEditSession: (callback) ->
     callback(editSession) for editSession in @getEditSessions()