github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12823 from atom/mb-as-guard-tab-length

Browse Source 
Guard against null tab length value
This commit is contained in:
Max Brunsfeld
2016-09-29 14:21:54 -07:00
committed by GitHub
parent 3c6236f74d ec5874e044
commit d79690e2d5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/text-editor-spec.coffee
View File

@@ -4876,6 +4876,11 @@ describe "TextEditor", ->
editor.setTabLength(6)
expect(changeHandler).not.toHaveBeenCalled()
it 'does not change its tab length when the given tab length is null', ->
editor.setTabLength(4)
editor.setTabLength(null)
expect(editor.getTabLength()).toBe(4)
describe ".indentLevelForLine(line)", ->
it "returns the indent level when the line has only leading whitespace", ->
expect(editor.indentLevelForLine(" hello")).toBe(2)

2
src/text-editor.coffee
View File

@@ -241,7 +241,7 @@ class TextEditor extends Model
displayLayerParams.atomicSoftTabs = value
when 'tabLength'
if value isnt @tokenizedBuffer.getTabLength()
if value? and value isnt @tokenizedBuffer.getTabLength()
@tokenizedBuffer.setTabLength(value)
displayLayerParams.tabLength = value