From 4832d36ac193598d2e897cb58162f7924c189fff Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 17 Jun 2014 14:35:56 -0600
Subject: [PATCH] Rename filterDecorationsByScreenRow to getLineDecorations

Also rename local variable to lineDecorations for clarity
---
 src/editor-component.coffee |  8 ++++----
 src/gutter-component.coffee | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index 74e353feb..c64546e3d 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -52,8 +52,8 @@ EditorComponent = React.createClass
       cursorScreenRanges = @getCursorScreenRanges(renderedRowRange)
 
       decorations = editor.decorationsForScreenRowRange(renderedStartRow, renderedEndRow)
-      decorationsByScreenRow = @filterDecorationsByScreenRow(decorations)
       highlightDecorations = @getHighlightDecorations(decorations)
+      lineDecorations = @getLineDecorations(decorations)
 
       scrollHeight = editor.getScrollHeight()
       scrollWidth = editor.getScrollWidth()
@@ -77,7 +77,7 @@ EditorComponent = React.createClass
 
     div className: className, style: {fontSize, lineHeight, fontFamily}, tabIndex: -1,
       GutterComponent {
-        ref: 'gutter', decorations: decorationsByScreenRow,
+        ref: 'gutter', lineDecorations,
         editor, renderedRowRange, maxLineNumberDigits,
         scrollTop, scrollHeight, lineHeightInPixels, @pendingChanges, mouseWheelScreenRow
       }
@@ -97,7 +97,7 @@ EditorComponent = React.createClass
         }
         LinesComponent {
           ref: 'lines',
-          editor, lineHeightInPixels, defaultCharWidth, decorationsByScreenRow, highlightDecorations,
+          editor, lineHeightInPixels, defaultCharWidth, lineDecorations, highlightDecorations,
           showIndentGuide, renderedRowRange, @pendingChanges, scrollTop, scrollLeft,
           @scrollingVertically, scrollHeight, scrollWidth, mouseWheelScreenRow, invisibles,
           visible, scrollViewHeight
@@ -221,7 +221,7 @@ EditorComponent = React.createClass
         cursorScreenRanges[cursor.id] = screenRange
     cursorScreenRanges
 
-  filterDecorationsByScreenRow: (decorationsByMarkerId) ->
+  getLineDecorations: (decorationsByMarkerId) ->
     decorationsByScreenRow = {}
     for id, decorations of decorationsByMarkerId
       for decoration in decorations
diff --git a/src/gutter-component.coffee b/src/gutter-component.coffee
index 2af7974ba..271b2704f 100644
--- a/src/gutter-component.coffee
+++ b/src/gutter-component.coffee
@@ -36,10 +36,10 @@ GutterComponent = React.createClass
   # visible row range.
   shouldComponentUpdate: (newProps) ->
     return true unless isEqualForProperties(newProps, @props,
-      'renderedRowRange', 'scrollTop', 'lineHeightInPixels', 'mouseWheelScreenRow', 'decorations'
+      'renderedRowRange', 'scrollTop', 'lineHeightInPixels', 'mouseWheelScreenRow', 'lineDecorations'
     )
 
-    {renderedRowRange, pendingChanges, decorations} = newProps
+    {renderedRowRange, pendingChanges, lineDecorations} = newProps
     for change in pendingChanges when Math.abs(change.screenDelta) > 0 or Math.abs(change.bufferDelta) > 0
       return true unless change.end <= renderedRowRange.start or renderedRowRange.end <= change.start
 
@@ -73,7 +73,7 @@ GutterComponent = React.createClass
     @removeLineNumberNodes(lineNumberIdsToPreserve)
 
   appendOrUpdateVisibleLineNumberNodes: ->
-    {editor, renderedRowRange, scrollTop, maxLineNumberDigits, decorations} = @props
+    {editor, renderedRowRange, scrollTop, maxLineNumberDigits, lineDecorations} = @props
     [startRow, endRow] = renderedRowRange
 
     newLineNumberIds = null
@@ -94,12 +94,12 @@ GutterComponent = React.createClass
       visibleLineNumberIds.add(id)
 
       if @hasLineNumberNode(id)
-        @updateLineNumberNode(id, bufferRow, screenRow, wrapCount > 0, decorations[screenRow])
+        @updateLineNumberNode(id, bufferRow, screenRow, wrapCount > 0, lineDecorations[screenRow])
       else
         newLineNumberIds ?= []
         newLineNumbersHTML ?= ""
         newLineNumberIds.push(id)
-        newLineNumbersHTML += @buildLineNumberHTML(bufferRow, wrapCount > 0, maxLineNumberDigits, screenRow, decorations[screenRow])
+        newLineNumbersHTML += @buildLineNumberHTML(bufferRow, wrapCount > 0, maxLineNumberDigits, screenRow, lineDecorations[screenRow])
         @screenRowsByLineNumberId[id] = screenRow
         @lineNumberIdsByScreenRow[screenRow] = id
 
@@ -113,7 +113,7 @@ GutterComponent = React.createClass
         @lineNumberNodesById[lineNumberId] = lineNumberNode
         node.appendChild(lineNumberNode)
 
-    @previousDecorations = decorations
+    @previousDecorations = lineDecorations
     visibleLineNumberIds
 
   removeLineNumberNodes: (lineNumberIdsToPreserve) ->