From d3099cb682819a7e4b5aed70fb9492cb2c844aaa Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 22 Mar 2013 19:15:42 -0600
Subject: [PATCH] Don't add grammars for atom packages until `activate` is
 called

---
 src/app/atom-package.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee
index 1ceeb62f0..f9a7da0be 100644
--- a/src/app/atom-package.coffee
+++ b/src/app/atom-package.coffee
@@ -10,6 +10,7 @@ class AtomPackage extends Package
   metadata: null
   keymaps: null
   stylesheets: null
+  grammars: null
   mainModule: null
   deferActivation: false
 
@@ -53,11 +54,10 @@ class AtomPackage extends Package
       @stylesheets.push([stylesheetPath, loadStylesheet(stylesheetPath)])
 
   loadGrammars: ->
+    @grammars = []
     grammarsDirPath = fs.join(@path, 'grammars')
     for grammarPath in fs.list(grammarsDirPath, ['.cson', '.json']) ? []
-      grammarContent = fs.readObject(grammarPath)
-      grammar = new TextMateGrammar(grammarContent)
-      syntax.addGrammar(grammar)
+      @grammars.push(TextMateGrammar.loadSync(grammarPath))
 
   loadScopedProperties: ->
     scopedPropertiessDirPath = fs.join(@path, 'scoped-properties')
@@ -68,6 +68,7 @@ class AtomPackage extends Package
   activate: ->
     keymap.add(map) for map in @keymaps
     applyStylesheet(path, content) for [path, content] in @stylesheets
+    syntax.addGrammar(grammar) for grammar in @grammars
 
     if @deferActivation
       @subscribeToActivationEvents()