Merge remote-tracking branch 'origin/dev' into cefode

spec/app/edit-session-spec.coffee

@@ -2033,6 +2033,19 @@ describe "EditSession", ->
       editSession.buffer.reload()
       expect(editSession.getCursorScreenPosition()).toEqual [0,1]
 
+  describe "when the 'grammars-loaded' event is triggered on the syntax global", ->
+    it "reloads the edit session's grammar and re-tokenizes the buffer if it changes", ->
+      editSession.destroy()
+      grammarToReturn = syntax.grammarByFileTypeSuffix('txt')
+      spyOn(syntax, 'grammarForFilePath').andCallFake -> grammarToReturn
+
+      editSession = project.buildEditSession('sample.js', autoIndent: false)
+      expect(editSession.lineForScreenRow(0).tokens.length).toBe 1
+
+      grammarToReturn = syntax.grammarByFileTypeSuffix('js')
+      syntax.trigger 'grammars-loaded'
+      expect(editSession.lineForScreenRow(0).tokens.length).toBeGreaterThan 1
+
   describe "auto-indent", ->
     describe "editor.autoIndent", ->
       it "auto-indents newlines if editor.autoIndent is true", ->

src/app/edit-session.coffee

@@ -61,6 +61,8 @@ class EditSession
     @subscribe @displayBuffer, "changed", (e) =>
       @trigger 'screen-lines-changed', e
 
+    @subscribe syntax, 'grammars-loaded', => @reloadGrammar()
+
   getViewClass: ->
     require 'editor'
 
@@ -841,11 +843,10 @@ class EditSession
   getGrammar: -> @languageMode.grammar
 
   reloadGrammar: ->
-    grammarChanged = @languageMode.reloadGrammar()
-    if grammarChanged
+    if @languageMode.reloadGrammar()
       @unfoldAll()
       @displayBuffer.tokenizedBuffer.resetScreenLines()
-    grammarChanged
+      true
 
   getDebugSnapshot: ->
     [