Conditionally include deprecations in DisplayBuffer

src/display-buffer.coffee

@@ -151,38 +151,11 @@ class DisplayBuffer extends Model
   onDidUpdateMarkers: (callback) ->
     @emitter.on 'did-update-markers', callback
 
-  on: (eventName) ->
-    switch eventName
-      when 'changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChange instead")
-      when 'grammar-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeGrammar instead")
-      when 'soft-wrap-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeSoftWrap instead")
-      when 'character-widths-changed'
-        Grim.deprecate("Use DisplayBuffer::onDidChangeCharacterWidths instead")
-      when 'decoration-added'
-        Grim.deprecate("Use DisplayBuffer::onDidAddDecoration instead")
-      when 'decoration-removed'
-        Grim.deprecate("Use DisplayBuffer::onDidRemoveDecoration instead")
-      when 'decoration-changed'
-        Grim.deprecate("Use decoration.getMarker().onDidChange() instead")
-      when 'decoration-updated'
-        Grim.deprecate("Use Decoration::onDidChangeProperties instead")
-      when 'marker-created'
-        Grim.deprecate("Use Decoration::onDidCreateMarker instead")
-      when 'markers-updated'
-        Grim.deprecate("Use Decoration::onDidUpdateMarkers instead")
-      else
-        Grim.deprecate("DisplayBuffer::on is deprecated. Use event subscription methods instead.")
-
-    EmitterMixin::on.apply(this, arguments)
-
   emitDidChange: (eventProperties, refreshMarkers=true) ->
     if refreshMarkers
       @pauseMarkerChangeEvents()
       @refreshMarkerScreenPositions()
-    @emit 'changed', eventProperties
+    @emit 'changed', eventProperties if Grim.includeDeprecations
     @emitter.emit 'did-change', eventProperties
     @resumeMarkerChangeEvents()
 
@@ -336,7 +309,7 @@ class DisplayBuffer extends Model
 
   characterWidthsChanged: ->
     @computeScrollWidth()
-    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount
+    @emit 'character-widths-changed', @scopedCharacterWidthsChangeCount if Grim.includeDeprecations
     @emitter.emit 'did-change-character-widths', @scopedCharacterWidthsChangeCount
 
   clearScopedCharWidths: ->
@@ -454,7 +427,7 @@ class DisplayBuffer extends Model
       @softWrapped = softWrapped
       @updateWrappedScreenLines()
       softWrapped = @isSoftWrapped()
-      @emit 'soft-wrap-changed', softWrapped
+      @emit 'soft-wrap-changed', softWrapped if Grim.includeDeprecations
       @emitter.emit 'did-change-soft-wrapped', softWrapped
       softWrapped
     else
@@ -938,7 +911,7 @@ class DisplayBuffer extends Model
     @decorationsByMarkerId[marker.id] ?= []
     @decorationsByMarkerId[marker.id].push(decoration)
     @decorationsById[decoration.id] = decoration
-    @emit 'decoration-added', decoration
+    @emit 'decoration-added', decoration if Grim.includeDeprecations
     @emitter.emit 'did-add-decoration', decoration
     decoration
 
@@ -950,7 +923,7 @@ class DisplayBuffer extends Model
     if index > -1
       decorations.splice(index, 1)
       delete @decorationsById[decoration.id]
-      @emit 'decoration-removed', decoration
+      @emit 'decoration-removed', decoration if Grim.includeDeprecations
       @emitter.emit 'did-remove-decoration', decoration
       delete @decorationsByMarkerId[marker.id] if decorations.length is 0
 
@@ -1102,7 +1075,7 @@ class DisplayBuffer extends Model
 
   resumeMarkerChangeEvents: ->
     marker.resumeChangeEvents() for marker in @getMarkers()
-    @emit 'markers-updated'
+    @emit 'markers-updated' if Grim.includeDeprecations
     @emitter.emit 'did-update-markers'
 
   refreshMarkerScreenPositions: ->
@@ -1244,7 +1217,7 @@ class DisplayBuffer extends Model
     if marker = @getMarker(textBufferMarker.id)
       # The marker might have been removed in some other handler called before
       # this one. Only emit when the marker still exists.
-      @emit 'marker-created', marker
+      @emit 'marker-created', marker if Grim.includeDeprecations
       @emitter.emit 'did-create-marker', marker
 
   createFoldForMarker: (marker) ->
@@ -1253,3 +1226,31 @@ class DisplayBuffer extends Model
 
   foldForMarker: (marker) ->
     @foldsByMarkerId[marker.id]
+
+if Grim.includeDeprecations
+  DisplayBuffer::on = (eventName) ->
+    switch eventName
+      when 'changed'
+        Grim.deprecate("Use DisplayBuffer::onDidChange instead")
+      when 'grammar-changed'
+        Grim.deprecate("Use DisplayBuffer::onDidChangeGrammar instead")
+      when 'soft-wrap-changed'
+        Grim.deprecate("Use DisplayBuffer::onDidChangeSoftWrap instead")
+      when 'character-widths-changed'
+        Grim.deprecate("Use DisplayBuffer::onDidChangeCharacterWidths instead")
+      when 'decoration-added'
+        Grim.deprecate("Use DisplayBuffer::onDidAddDecoration instead")
+      when 'decoration-removed'
+        Grim.deprecate("Use DisplayBuffer::onDidRemoveDecoration instead")
+      when 'decoration-changed'
+        Grim.deprecate("Use decoration.getMarker().onDidChange() instead")
+      when 'decoration-updated'
+        Grim.deprecate("Use Decoration::onDidChangeProperties instead")
+      when 'marker-created'
+        Grim.deprecate("Use Decoration::onDidCreateMarker instead")
+      when 'markers-updated'
+        Grim.deprecate("Use Decoration::onDidUpdateMarkers instead")
+      else
+        Grim.deprecate("DisplayBuffer::on is deprecated. Use event subscription methods instead.")
+
+    EmitterMixin::on.apply(this, arguments)