Rename editor.softWrapped config option back to editor.softWrap

This commit is contained in:
Nathan Sobo 2014-09-15 14:33:11 -06:00
parent 69480385e6
commit a0edb92e16
4 changed files with 6 additions and 6 deletions

View File

@ -123,7 +123,7 @@ You can open this file in an editor from the _Atom > Open Your Config_ menu.
- `showInvisibles`: Whether to render placeholders for invisible characters (defaults to `false`)
- `showIndentGuide`: Show/hide indent indicators within the editor
- `showLineNumbers`: Show/hide line numbers within the gutter
- `softWrapped`: Enable/disable soft wrapping of text within the editor
- `softWrap`: Enable/disable soft wrapping of text within the editor
- `softWrapAtPreferredLineLength`: Enable/disable soft line wrapping at `preferredLineLength`
- `tabLength`: Number of spaces within a tab (defaults to `2`)
- `fuzzyFinder`

View File

@ -98,11 +98,11 @@ describe "Editor", ->
expect(editor2.isFoldedAtBufferRow(4)).not.toBe editor.isFoldedAtBufferRow(4)
describe "config defaults", ->
it "uses the `editor.tabLength`, `editor.softWrapped`, and `editor.softTabs` config values", ->
it "uses the `editor.tabLength`, `editor.softWrap`, and `editor.softTabs` config values", ->
editor1 = null
editor2 = null
atom.config.set('editor.tabLength', 4)
atom.config.set('editor.softWrapped', true)
atom.config.set('editor.softWrap', true)
atom.config.set('editor.softTabs', false)
waitsForPromise ->
@ -114,7 +114,7 @@ describe "Editor", ->
expect(editor1.getSoftTabs()).toBe false
atom.config.set('editor.tabLength', 100)
atom.config.set('editor.softWrapped', false)
atom.config.set('editor.softWrap', false)
atom.config.set('editor.softTabs', true)
waitsForPromise ->

View File

@ -45,7 +45,7 @@ class DisplayBuffer extends Model
@emitter = new Emitter
@softWrapped ?= atom.config.get('editor.softWrapped') ? false
@softWrapped ?= atom.config.get('editor.softWrap') ? false
@tokenizedBuffer ?= new TokenizedBuffer({tabLength, buffer, @invisibles})
@buffer = @tokenizedBuffer.buffer
@charWidthsByScope = {}

View File

@ -47,7 +47,7 @@ class EditorView extends View
nonWordCharacters: "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-"
preferredLineLength: 80
tabLength: 2
softWrapped: false
softWrap: false
softTabs: true
softWrapAtPreferredLineLength: false
scrollSensitivity: 40