From 5d7c2fc8bae0b48cf35581ec613f42ff81a72481 Mon Sep 17 00:00:00 2001
From: joshaber <joshaber@gmail.com>
Date: Tue, 26 Apr 2016 10:32:41 -0400
Subject: [PATCH] Just observe the grammar.

---
 src/display-buffer.coffee   | 3 ---
 src/text-editor.coffee      | 3 ---
 src/tokenized-buffer.coffee | 8 --------
 src/workspace.coffee        | 2 +-
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index ccc68535f..109b791a1 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -136,9 +136,6 @@ class DisplayBuffer extends Model
   onDidChangeGrammar: (callback) ->
     @tokenizedBuffer.onDidChangeGrammar(callback)
 
-  onDidUseGrammar: (callback) ->
-    @tokenizedBuffer.onDidUseGrammar(callback)
-
   onDidTokenize: (callback) ->
     @tokenizedBuffer.onDidTokenize(callback)
 
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index 865026e20..aeb5ebe5c 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -323,9 +323,6 @@ class TextEditor extends Model
   onDidChangeGrammar: (callback) ->
     @emitter.on 'did-change-grammar', callback
 
-  onDidUseGrammar: (callback) ->
-    @displayBuffer.onDidUseGrammar(callback)
-
   # Extended: Calls your `callback` when the result of {::isModified} changes.
   #
   # * `callback` {Function}
diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 7e3c4fe49..065715806 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -128,14 +128,6 @@ class TokenizedBuffer extends Model
 
     @emitter.emit 'did-change-grammar', grammar
 
-    # Delay this to the next tick to ensure whoever created the buffer has the
-    # chance to listen for this event before we send it.
-    process.nextTick =>
-      @emitter.emit 'did-use-grammar', grammar
-
-  onDidUseGrammar: (callback) ->
-    @emitter.on 'did-use-grammar', callback
-
   getGrammarSelectionContent: ->
     @buffer.getTextInRange([[0, 0], [10, 0]])
 
diff --git a/src/workspace.coffee b/src/workspace.coffee
index 9a52dc937..7e67de97d 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -550,7 +550,7 @@ class Workspace extends Model
     @project.bufferForPath(filePath, options).then (buffer) =>
       editor = @buildTextEditor(_.extend({buffer, largeFileMode}, options))
       disposable = atom.textEditors.add(editor)
-      grammarSubscription = editor.onDidUseGrammar(@handleGrammarUsed.bind(this))
+      grammarSubscription = editor.observeGrammar(@handleGrammarUsed.bind(this))
       editor.onDidDestroy ->
         grammarSubscription.dispose()
         disposable.dispose()