Name changes

spec/editor-component-spec.coffee

@@ -309,14 +309,14 @@ describe "EditorComponent", ->
         lineHasClass = (screenRow, klass) ->
           component.lineNumberNodeForScreenRow(screenRow).classList.contains(klass)
 
-      it "renders the gutter-class decorations", ->
+      it "renders the gutter decorations", ->
         node.style.height = 4.5 * lineHeightInPixels + 'px'
         component.measureScrollView()
 
         expect(component.lineNumberNodeForScreenRow(9)).toBeFalsy()
 
-        editor.addDecorationForBufferRow(9, {type: 'gutter-class', class: 'fancy-class'})
-        editor.addDecorationForBufferRow(9, {type: 'someother-type', class: 'nope-class'})
+        editor.addDecorationToBufferRow(9, {type: 'gutter', class: 'fancy-class'})
+        editor.addDecorationToBufferRow(9, {type: 'someother-type', class: 'nope-class'})
 
         verticalScrollbarNode.scrollTop = 2.5 * lineHeightInPixels
         verticalScrollbarNode.dispatchEvent(new UIEvent('scroll'))
@@ -324,17 +324,17 @@ describe "EditorComponent", ->
         expect(lineHasClass(9, 'fancy-class')).toBeTruthy()
         expect(lineHasClass(9, 'nope-class')).toBeFalsy()
 
-      it "handles updates to gutter-class decorations", ->
-        editor.addDecorationForBufferRow(2, {type: 'gutter-class', class: 'fancy-class'})
-        editor.addDecorationForBufferRow(2, {type: 'someother-type', class: 'nope-class'})
+      it "handles updates to gutter decorations", ->
+        editor.addDecorationToBufferRow(2, {type: 'gutter', class: 'fancy-class'})
+        editor.addDecorationToBufferRow(2, {type: 'someother-type', class: 'nope-class'})
 
         advanceClock(gutter.decorationRenderDelay)
 
         expect(lineHasClass(2, 'fancy-class')).toBeTruthy()
         expect(lineHasClass(2, 'nope-class')).toBeFalsy()
 
-        editor.removeDecorationForBufferRow(2, {type: 'gutter-class', class: 'fancy-class'})
-        editor.removeDecorationForBufferRow(2, {type: 'someother-type', class: 'nope-class'})
+        editor.removeDecorationFromBufferRow(2, {type: 'gutter', class: 'fancy-class'})
+        editor.removeDecorationFromBufferRow(2, {type: 'someother-type', class: 'nope-class'})
 
         advanceClock(gutter.decorationRenderDelay)
 
@@ -342,8 +342,8 @@ describe "EditorComponent", ->
         expect(lineHasClass(2, 'nope-class')).toBeFalsy()
 
       it "handles softWrap decorations", ->
-        editor.addDecorationForBufferRow(1, {type: 'gutter-class', class: 'no-wrap'})
-        editor.addDecorationForBufferRow(1, {type: 'gutter-class', class: 'wrap-me', softWrap: true})
+        editor.addDecorationToBufferRow(1, {type: 'gutter', class: 'no-wrap'})
+        editor.addDecorationToBufferRow(1, {type: 'gutter', class: 'wrap-me', softWrap: true})
 
         editor.setSoftWrap(true)
         node.style.height = 4.5 * lineHeightInPixels + 'px'
@@ -356,8 +356,8 @@ describe "EditorComponent", ->
         expect(lineHasClass(3, 'wrap-me')).toBeTruthy()
 
         # should remove the wrapped decorations
-        editor.removeDecorationForBufferRow(1, {type: 'gutter-class', class: 'no-wrap'})
-        editor.removeDecorationForBufferRow(1, {type: 'gutter-class', class: 'wrap-me'})
+        editor.removeDecorationFromBufferRow(1, {type: 'gutter', class: 'no-wrap'})
+        editor.removeDecorationFromBufferRow(1, {type: 'gutter', class: 'wrap-me'})
         advanceClock(gutter.decorationRenderDelay)
 
         expect(lineHasClass(2, 'no-wrap')).toBeFalsy()
@@ -366,8 +366,8 @@ describe "EditorComponent", ->
         expect(lineHasClass(3, 'wrap-me')).toBeFalsy()
 
         # should add them back when the nodes are not recreated
-        editor.addDecorationForBufferRow(1, {type: 'gutter-class', class: 'no-wrap'})
-        editor.addDecorationForBufferRow(1, {type: 'gutter-class', class: 'wrap-me', softWrap: true})
+        editor.addDecorationToBufferRow(1, {type: 'gutter', class: 'no-wrap'})
+        editor.addDecorationToBufferRow(1, {type: 'gutter', class: 'wrap-me', softWrap: true})
         advanceClock(gutter.decorationRenderDelay)
 
         expect(lineHasClass(2, 'no-wrap')).toBeTruthy()
@@ -379,7 +379,7 @@ describe "EditorComponent", ->
         {marker, decoration} = {}
         beforeEach ->
           marker = editor.displayBuffer.markBufferRange([[2, 13], [3, 15]], class: 'my-marker', invalidate: 'inside')
-          decoration = {type: 'gutter-class', class: 'someclass'}
+          decoration = {type: 'gutter', class: 'someclass'}
           editor.addDecorationForMarker(marker, decoration)
           advanceClock(gutter.decorationRenderDelay)
 

spec/editor-spec.coffee

@@ -3208,14 +3208,14 @@ describe "Editor", ->
 
   describe "decorations", ->
     it "can add and remove decorations", ->
-      decoration = {type: 'gutter-class', class: 'one'}
-      editor.addDecorationForBufferRow(2, decoration)
-      editor.addDecorationForBufferRow(2, decoration)
+      decoration = {type: 'gutter', class: 'one'}
+      editor.addDecorationToBufferRow(2, decoration)
+      editor.addDecorationToBufferRow(2, decoration)
 
       decorations = editor.decorationsForBufferRow(2)
       expect(decorations).toHaveLength 1
       expect(decorations).toContain decoration
 
-      editor.removeDecorationForBufferRow(2, decoration)
+      editor.removeDecorationFromBufferRow(2, decoration)
       decorations = editor.decorationsForBufferRow(2)
       expect(decorations).toHaveLength 0

src/display-buffer.coffee

@@ -725,14 +725,14 @@ class DisplayBuffer extends Model
     decorations = (dec for dec in decorations when dec.type == decorationType) if decorationType?
     decorations
 
-  addDecorationForBufferRow: (bufferRow, decoration) ->
+  addDecorationToBufferRow: (bufferRow, decoration) ->
     @decorations[bufferRow] ?= []
     for current in @decorations[bufferRow]
       return if _.isEqual(current, decoration)
     @decorations[bufferRow].push(decoration)
     @emit 'decoration-changed', {bufferRow, decoration, action: 'add'}
 
-  removeDecorationForBufferRow: (bufferRow, decoration) ->
+  removeDecorationFromBufferRow: (bufferRow, decoration) ->
     return unless @decorations[bufferRow]
 
     removed = @findDecorationsForBufferRow(bufferRow, decoration)
@@ -753,7 +753,7 @@ class DisplayBuffer extends Model
     tail = marker.getTailBufferPosition().row
     [tail, head] = [head, tail] if head > tail
     while head <= tail
-      @addDecorationForBufferRow(head++, decoration)
+      @addDecorationToBufferRow(head++, decoration)
 
     changedSubscription = @subscribe marker, 'changed', (e) =>
       oldHead = e.oldHeadBufferPosition.row
@@ -772,11 +772,11 @@ class DisplayBuffer extends Model
       # overlap was not visible.
 
       while oldHead <= oldTail
-        @removeDecorationForBufferRow(oldHead, decoration)
+        @removeDecorationFromBufferRow(oldHead, decoration)
         oldHead++
 
       while e.isValid and newHead <= newTail
-        @addDecorationForBufferRow(newHead, decoration)
+        @addDecorationToBufferRow(newHead, decoration)
         newHead++
 
     destroyedSubscription = @subscribe marker, 'destroyed', (e) =>
@@ -792,7 +792,7 @@ class DisplayBuffer extends Model
     tail = marker.getTailBufferPosition().row
     [tail, head] = [head, tail] if head > tail
     while head <= tail
-      @removeDecorationForBufferRow(head++, decoration)
+      @removeDecorationFromBufferRow(head++, decoration)
 
     for sub in _.clone(@decorationMarkerSubscriptions[marker.id])
       if @decorationEqualsPattern(sub.decoration, decoration)

src/editor.coffee

@@ -1061,11 +1061,11 @@ class Editor extends Model
   decorationsForBufferRow: (bufferRow, decorationType) ->
     @displayBuffer.decorationsForBufferRow(bufferRow, decorationType)
 
-  addDecorationForBufferRow: (bufferRow, decoration) ->
-    @displayBuffer.addDecorationForBufferRow(bufferRow, decoration)
+  addDecorationToBufferRow: (bufferRow, decoration) ->
+    @displayBuffer.addDecorationToBufferRow(bufferRow, decoration)
 
-  removeDecorationForBufferRow: (bufferRow, decoration) ->
-    @displayBuffer.removeDecorationForBufferRow(bufferRow, decoration)
+  removeDecorationFromBufferRow: (bufferRow, decoration) ->
+    @displayBuffer.removeDecorationFromBufferRow(bufferRow, decoration)
 
   addDecorationForMarker: (marker, decoration) ->
     @displayBuffer.addDecorationForMarker(marker, decoration)

src/gutter-component.coffee

@@ -9,7 +9,7 @@ module.exports =
 GutterComponent = React.createClass
   displayName: 'GutterComponent'
   mixins: [SubscriberMixin]
-  decorationType: 'gutter-class'
+  decorationType: 'gutter'
   decorationRenderDelay: 100
 
   dummyLineNumberNode: null