From 85188ced03fdac0eb61694455e69020600f067c7 Mon Sep 17 00:00:00 2001
From: Jess Lin <jessicalin@fb.com>
Date: Sat, 18 Apr 2015 16:48:38 -0700
Subject: [PATCH] [Gutter] Move 'lineNumberGutter' state to nest under
 'gutters' in the presenter state

---
 spec/gutter-container-component-spec.coffee |  6 +++---
 spec/text-editor-presenter-spec.coffee      |  6 +++---
 src/line-number-gutter-component.coffee     |  2 +-
 src/text-editor-presenter.coffee            | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spec/gutter-container-component-spec.coffee b/spec/gutter-container-component-spec.coffee
index cb3ca37eb..1a286e522 100644
--- a/spec/gutter-container-component-spec.coffee
+++ b/spec/gutter-container-component-spec.coffee
@@ -13,9 +13,9 @@ describe "GutterContainerComponent", ->
         backgroundColor: 'black'
         sortedDescriptions: sortedDescriptions
         customDecorations: {}
-      lineNumberGutter:
-        maxLineNumberDigits: 10
-        lineNumbers: {}
+        lineNumberGutter:
+          maxLineNumberDigits: 10
+          lineNumbers: {}
     mockTestState
 
   beforeEach ->
diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee
index 9cf1c2236..5597d031c 100644
--- a/spec/text-editor-presenter-spec.coffee
+++ b/spec/text-editor-presenter-spec.coffee
@@ -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)
diff --git a/src/line-number-gutter-component.coffee b/src/line-number-gutter-component.coffee
index b79b08fdb..e37244680 100644
--- a/src/line-number-gutter-component.coffee
+++ b/src/line-number-gutter-component.coffee
@@ -34,7 +34,7 @@ class LineNumberGutterComponent
       @visible = true
 
   updateSync: (state) ->
-    @newState = state.lineNumberGutter
+    @newState = state.gutters.lineNumberGutter
     @oldState ?= {lineNumbers: {}}
 
     @appendDummyLineNumber() unless @dummyLineNumberNode?
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 3c2e5f5ca..7ce51effe 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -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