From fccc9ebee4cdd9e26e3f9dd975c5a5d80b4dc327 Mon Sep 17 00:00:00 2001 From: Jess Lin Date: Wed, 4 Mar 2015 15:15:04 -0800 Subject: [PATCH] [Gutter] Rename current references to 'Gutter' -> 'LineNumberGutter' --- spec/text-editor-component-spec.coffee | 6 +++--- spec/text-editor-element-spec.coffee | 2 +- spec/text-editor-presenter-spec.coffee | 8 ++++---- src/text-editor-element.coffee | 2 +- src/text-editor-presenter.coffee | 4 ++-- src/text-editor.coffee | 18 +++++++++--------- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee index 955504319..80d22ddcd 100644 --- a/spec/text-editor-component-spec.coffee +++ b/spec/text-editor-component-spec.coffee @@ -578,10 +578,10 @@ describe "TextEditorComponent", -> nextAnimationFrame() expect(lineNumbersNode.style.backgroundColor).toBe 'rgb(255, 0, 0)' - it "hides or shows the gutter based on the '::isGutterVisible' property on the model and the global 'editor.showLineNumbers' config setting", -> + it "hides or shows the gutter based on the '::isLineNumberGutterVisible' property on the model and the global 'editor.showLineNumbers' config setting", -> expect(component.gutterComponent?).toBe true - editor.setGutterVisible(false) + editor.setLineNumberGutterVisible(false) nextAnimationFrame() expect(componentNode.querySelector('.gutter')).toBeNull() @@ -591,7 +591,7 @@ describe "TextEditorComponent", -> expect(componentNode.querySelector('.gutter')).toBeNull() - editor.setGutterVisible(true) + editor.setLineNumberGutterVisible(true) nextAnimationFrame() expect(componentNode.querySelector('.gutter')).toBeNull() diff --git a/spec/text-editor-element-spec.coffee b/spec/text-editor-element-spec.coffee index f6082b571..ba71cb236 100644 --- a/spec/text-editor-element-spec.coffee +++ b/spec/text-editor-element-spec.coffee @@ -23,7 +23,7 @@ describe "TextEditorElement", -> it "honors the 'gutter-hidden' attribute", -> jasmineContent.innerHTML = "" element = jasmineContent.firstChild - expect(element.getModel().isGutterVisible()).toBe false + expect(element.getModel().isLineNumberGutterVisible()).toBe false it "honors the text content", -> jasmineContent.innerHTML = "testing" diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee index 577c87401..0659abf27 100644 --- a/spec/text-editor-presenter-spec.coffee +++ b/spec/text-editor-presenter-spec.coffee @@ -2166,10 +2166,10 @@ describe "TextEditorPresenter", -> expect(lineNumberStateForScreenRow(presenter, 11).foldable).toBe false describe ".visible", -> - it "is true iff the editor isn't mini, ::isGutterVisible is true on the editor, and 'editor.showLineNumbers' is enabled in config", -> + it "is true iff the editor isn't mini, ::isLineNumberGutterVisible is true on the editor, and 'editor.showLineNumbers' is enabled in config", -> presenter = buildPresenter() - expect(editor.isGutterVisible()).toBe true + expect(editor.isLineNumberGutterVisible()).toBe true expect(presenter.getState().gutter.visible).toBe true expectStateUpdate presenter, -> editor.setMini(true) @@ -2178,10 +2178,10 @@ describe "TextEditorPresenter", -> expectStateUpdate presenter, -> editor.setMini(false) expect(presenter.getState().gutter.visible).toBe true - expectStateUpdate presenter, -> editor.setGutterVisible(false) + expectStateUpdate presenter, -> editor.setLineNumberGutterVisible(false) expect(presenter.getState().gutter.visible).toBe false - expectStateUpdate presenter, -> editor.setGutterVisible(true) + expectStateUpdate presenter, -> editor.setLineNumberGutterVisible(true) expect(presenter.getState().gutter.visible).toBe true expectStateUpdate presenter, -> atom.config.set('editor.showLineNumbers', false) diff --git a/src/text-editor-element.coffee b/src/text-editor-element.coffee index 99ae8ca17..0884b4248 100644 --- a/src/text-editor-element.coffee +++ b/src/text-editor-element.coffee @@ -100,7 +100,7 @@ class TextEditorElement extends HTMLElement tabLength: 2 softTabs: true mini: @hasAttribute('mini') - gutterVisible: not @hasAttribute('gutter-hidden') + lineNumberGutterVisible: not @hasAttribute('gutter-hidden') placeholderText: @getAttribute('placeholder-text') )) diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 5b30178d6..0de512cf9 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -117,7 +117,7 @@ class TextEditorPresenter @updateLinesState() @updateGutterState() @updateLineNumbersState() - @disposables.add @model.onDidChangeGutterVisible => + @disposables.add @model.onDidChangeLineNumberGutterVisible => @updateGutterState() @disposables.add @model.onDidAddDecoration(@didAddDecoration.bind(this)) @disposables.add @model.onDidAddCursor(@didAddCursor.bind(this)) @@ -364,7 +364,7 @@ class TextEditorPresenter return updateGutterState: -> @batch "shouldUpdateGutterState", -> - @state.gutter.visible = not @model.isMini() and (@model.isGutterVisible() ? true) and @showLineNumbers + @state.gutter.visible = not @model.isMini() and (@model.isLineNumberGutterVisible() ? true) and @showLineNumbers @state.gutter.maxLineNumberDigits = @model.getLineCount().toString().length @state.gutter.backgroundColor = if @gutterBackgroundColor isnt "rgba(0, 0, 0, 0)" @gutterBackgroundColor diff --git a/src/text-editor.coffee b/src/text-editor.coffee index 454abbabf..b94a05e40 100644 --- a/src/text-editor.coffee +++ b/src/text-editor.coffee @@ -73,7 +73,7 @@ class TextEditor extends Model 'autoDecreaseIndentForBufferRow', 'toggleLineCommentForBufferRow', 'toggleLineCommentsForBufferRows', toProperty: 'languageMode' - constructor: ({@softTabs, initialLine, initialColumn, tabLength, softWrapped, @displayBuffer, buffer, registerEditor, suppressCursorCreation, @mini, @placeholderText, @gutterVisible}) -> + constructor: ({@softTabs, initialLine, initialColumn, tabLength, softWrapped, @displayBuffer, buffer, registerEditor, suppressCursorCreation, @mini, @placeholderText, @lineNumberGutterVisible}) -> super @emitter = new Emitter @@ -488,16 +488,16 @@ class TextEditor extends Model onDidChangeMini: (callback) -> @emitter.on 'did-change-mini', callback - setGutterVisible: (gutterVisible) -> - unless gutterVisible is @gutterVisible - @gutterVisible = gutterVisible - @emitter.emit 'did-change-gutter-visible', @gutterVisible - @gutterVisible + setLineNumberGutterVisible: (lineNumberGutterVisible) -> + unless lineNumberGutterVisible is @lineNumberGutterVisible + @lineNumberGutterVisible = lineNumberGutterVisible + @emitter.emit 'did-change-line-number-gutter-visible', @lineNumberGutterVisible + @lineNumberGutterVisible - isGutterVisible: -> @gutterVisible ? true + isLineNumberGutterVisible: -> @lineNumberGutterVisible ? true - onDidChangeGutterVisible: (callback) -> - @emitter.on 'did-change-gutter-visible', callback + onDidChangeLineNumberGutterVisible: (callback) -> + @emitter.on 'did-change-line-number-gutter-visible', callback # Set the number of characters that can be displayed horizontally in the # editor.