From 83b679dcc2f273fba146ecd6990be1fd5e00aff1 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 15:58:38 -0700
Subject: [PATCH] ::subscribe -> CompositeDisposable

---
 src/tokenized-buffer.coffee | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 303906ada..ff06c66e6 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -1,6 +1,6 @@
 _ = require 'underscore-plus'
 {Model} = require 'theorist'
-{Emitter} = require 'event-kit'
+{CompositeDisposable, Emitter} = require 'event-kit'
 {Point, Range} = require 'text-buffer'
 Serializable = require 'serializable'
 TokenizedLine = require './tokenized-line'
@@ -24,15 +24,19 @@ class TokenizedBuffer extends Model
 
   constructor: ({@buffer, @tabLength, @invisibles}) ->
     @emitter = new Emitter
+    @disposables = new CompositeDisposable
 
-    @subscribe atom.grammars.onDidAddGrammar(@grammarAddedOrUpdated)
-    @subscribe atom.grammars.onDidUpdateGrammar(@grammarAddedOrUpdated)
+    @disposables.add atom.grammars.onDidAddGrammar(@grammarAddedOrUpdated)
+    @disposables.add atom.grammars.onDidUpdateGrammar(@grammarAddedOrUpdated)
 
-    @subscribe @buffer.preemptDidChange (e) => @handleBufferChange(e)
-    @subscribe @buffer.onDidChangePath (@bufferPath) => @reloadGrammar()
+    @disposables.add @buffer.preemptDidChange (e) => @handleBufferChange(e)
+    @disposables.add @buffer.onDidChangePath (@bufferPath) => @reloadGrammar()
 
     @reloadGrammar()
 
+  destroyed: ->
+    @disposables.dispose()
+
   serializeParams: ->
     bufferPath: @buffer.getPath()
     tabLength: @tabLength
@@ -64,11 +68,14 @@ class TokenizedBuffer extends Model
 
   setGrammar: (grammar, score) ->
     return if grammar is @grammar
-    @unsubscribe(@grammar) if @grammar
+
     @grammar = grammar
     @rootScopeDescriptor = new ScopeDescriptor(scopes: [@grammar.scopeName])
     @currentGrammarScore = score ? grammar.getScore(@buffer.getPath(), @buffer.getText())
-    @subscribe @grammar.onDidUpdate => @retokenizeLines()
+
+    @grammarUpdateDisposable?.dispose()
+    @grammarUpdateDisposable = @grammar.onDidUpdate => @retokenizeLines()
+    @disposables.add(@grammarUpdateDisposable)
 
     @configSettings = tabLength: atom.config.get('editor.tabLength', scope: @rootScopeDescriptor)
 
@@ -76,7 +83,7 @@ class TokenizedBuffer extends Model
     @grammarTabLengthSubscription = atom.config.onDidChange 'editor.tabLength', scope: @rootScopeDescriptor, ({newValue}) =>
       @configSettings.tabLength = newValue
       @retokenizeLines()
-    @subscribe @grammarTabLengthSubscription
+    @disposables.add(@grammarTabLengthSubscription)
 
     @retokenizeLines()