From 556d79b544f5136682fcad64e715b3fb015f5d71 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 29 Sep 2016 12:01:39 -0700 Subject: [PATCH] Guard against null tab length value Signed-off-by: Antonio Scandurra --- spec/text-editor-spec.coffee | 5 +++++ src/text-editor.coffee | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 1737abe7c..247e14f0a 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -4878,6 +4878,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) diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 1224cb70e..aa92019fd 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -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