github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Gutter] Move 'lineNumberGutter' state to nest under 'gutters' in the presenter state

Browse Source
This commit is contained in:
Jess Lin
2015-04-18 16:48:38 -07:00
parent 79b460a0ca
commit 85188ced03
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/gutter-container-component-spec.coffee
View File

@@ -13,9 +13,9 @@ describe "GutterContainerComponent", ->
backgroundColor: 'black'
sortedDescriptions: sortedDescriptions
customDecorations: {}
lineNumberGutter:
maxLineNumberDigits: 10
lineNumbers: {}
lineNumberGutter:
maxLineNumberDigits: 10
lineNumbers: {}
mockTestState
beforeEach ->

6
spec/text-editor-presenter-spec.coffee
View File

@@ -1771,10 +1771,10 @@ describe "TextEditorPresenter", ->
it "is set to the number of digits used by the greatest line number", ->
presenter = buildPresenter()
expect(editor.getLastBufferRow()).toBe 12
expect(presenter.getState().lineNumberGutter.maxLineNumberDigits).toBe 2
expect(presenter.getState().gutters.lineNumberGutter.maxLineNumberDigits).toBe 2
editor.setText("1\n2\n3")
expect(presenter.getState().lineNumberGutter.maxLineNumberDigits).toBe 1
expect(presenter.getState().gutters.lineNumberGutter.maxLineNumberDigits).toBe 1
describe ".lineNumbers", ->
lineNumberStateForScreenRow = (presenter, screenRow) ->
@@ -1786,7 +1786,7 @@ describe "TextEditorPresenter", ->
else
key = bufferRow
presenter.getState().lineNumberGutter.lineNumbers[key]
presenter.getState().gutters.lineNumberGutter.lineNumbers[key]
it "contains states for line numbers that are visible on screen, plus and minus the overdraw margin", ->
editor.foldBufferRow(4)

2
src/line-number-gutter-component.coffee
View File

@@ -34,7 +34,7 @@ class LineNumberGutterComponent
@visible = true
updateSync: (state) ->
@newState = state.lineNumberGutter
@newState = state.gutters.lineNumberGutter
@oldState ?= {lineNumbers: {}}
@appendDummyLineNumber() unless @dummyLineNumberNode?

12
src/text-editor-presenter.coffee
View File

@@ -183,11 +183,11 @@ class TextEditorPresenter
lines: {}
highlights: {}
overlays: {}
lineNumberGutter:
lineNumbers: {}
gutters:
sortedDescriptions: []
customDecorations: {}
lineNumberGutter:
lineNumbers: {}
@updateState()
updateState: ->
@@ -384,7 +384,7 @@ class TextEditorPresenter
return
updateLineNumberGutterState: -> @batch "shouldUpdateLineNumberGutterState", ->
@state.lineNumberGutter.maxLineNumberDigits = @model.getLineCount().toString().length
@state.gutters.lineNumberGutter.maxLineNumberDigits = @model.getLineCount().toString().length
updateCommonGutterState: ->
@state.gutters.backgroundColor = if @gutterBackgroundColor isnt "rgba(0, 0, 0, 0)"
@@ -481,7 +481,7 @@ class TextEditorPresenter
decorationClasses = @lineNumberDecorationClassesForRow(screenRow)
foldable = @model.isFoldableAtScreenRow(screenRow)
@state.lineNumberGutter.lineNumbers[id] = {screenRow, bufferRow, softWrapped, top, decorationClasses, foldable}
@state.gutters.lineNumberGutter.lineNumbers[id] = {screenRow, bufferRow, softWrapped, top, decorationClasses, foldable}
visibleLineNumberIds[id] = true
if @mouseWheelScreenRow?
@@ -491,8 +491,8 @@ class TextEditorPresenter
id += '-' + wrapCount if wrapCount > 0
visibleLineNumberIds[id] = true
for id of @state.lineNumberGutter.lineNumbers
delete @state.lineNumberGutter.lineNumbers[id] unless visibleLineNumberIds[id]
for id of @state.gutters.lineNumberGutter.lineNumbers
delete @state.gutters.lineNumberGutter.lineNumbers[id] unless visibleLineNumberIds[id]
return