From 643a5c6d0e3b215d07e230bbab2d1e4c2e07a2c1 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Nathan Sobo <cj+nathan@github.com>
Date: Mon, 25 Mar 2013 17:08:07 -0700
Subject: [PATCH] :lipstick:

---
 src/app/atom-package.coffee | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee
index 61c9c3879..2d4c68219 100644
--- a/src/app/atom-package.coffee
+++ b/src/app/atom-package.coffee
@@ -31,6 +31,24 @@ class AtomPackage extends Package
       console.warn "Failed to load package named '#{@name}'", e.stack
     this
 
+  activate: ({immediate}={}) ->
+    keymap.add(map) for map in @keymaps
+    applyStylesheet(path, content) for [path, content] in @stylesheets
+    syntax.addGrammar(grammar) for grammar in @grammars
+
+    if @deferActivation and not immediate
+      @subscribeToActivationEvents()
+    else
+      @activateNow()
+
+  activateNow: ->
+    try
+      if @requireMainModule()
+        config.setDefaults(@name, @mainModule.configDefaults)
+        @mainModule.activate(atom.getPackageState(@name) ? {})
+    catch e
+      console.warn "Failed to activate package named '#{@name}'", e.stack
+
   loadMetadata: ->
     if metadataPath = fs.resolveExtension(fs.join(@path, 'package'), ['cson', 'json'])
       @metadata = CSON.readObject(metadataPath)
@@ -67,24 +85,6 @@ class AtomPackage extends Package
       for selector, properties of fs.readObject(scopedPropertiesPath)
         syntax.addProperties(selector, properties)
 
-  activate: ({immediate}={}) ->
-    keymap.add(map) for map in @keymaps
-    applyStylesheet(path, content) for [path, content] in @stylesheets
-    syntax.addGrammar(grammar) for grammar in @grammars
-
-    if @deferActivation and not immediate
-      @subscribeToActivationEvents()
-    else
-      @activateNow()
-
-  activateNow: ->
-    try
-      if @requireMainModule()
-        config.setDefaults(@name, @mainModule.configDefaults)
-        @mainModule.activate(atom.getPackageState(@name) ? {})
-    catch e
-      console.warn "Failed to activate package named '#{@name}'", e.stack
-
   serialize: ->
     try
       @mainModule?.serialize?()