Merge pull request #1040 from atom/ks-speed-up-load

Speed up start time

package.json

@@ -33,7 +33,7 @@
     "q": "0.9.7",
     "rimraf": "2.1.4",
     "scandal": "0.6.0",
-    "season": "0.13.0",
+    "season": "0.14.0",
     "semver": "1.1.4",
     "space-pen": "2.0.0",
     "telepath": "0.8.1",
@@ -103,7 +103,7 @@
     "symbols-view": "0.15.0",
     "tabs": "0.7.0",
     "terminal": "0.14.0",
-    "timecop": "0.7.0",
+    "timecop": "0.9.0",
     "to-the-hubs": "0.8.0",
     "toml": "0.3.0",
     "tree-view": "0.22.0",

spec/config-spec.coffee

@@ -56,6 +56,17 @@ describe "Config", ->
       expect(config.get("foo.bar.baz")).toEqual ["a", "b"]
       expect(observeHandler).toHaveBeenCalledWith config.get("foo.bar.baz"), {previous: ['a']}
 
+  describe ".unshiftAtKeyPath(keyPath, value)", ->
+    it "unshifts the given value to the array at the key path and updates observers", ->
+      config.set("foo.bar.baz", ["b"])
+      observeHandler = jasmine.createSpy "observeHandler"
+      config.observe "foo.bar.baz", observeHandler
+      observeHandler.reset()
+
+      expect(config.unshiftAtKeyPath("foo.bar.baz", "a")).toBe 2
+      expect(config.get("foo.bar.baz")).toEqual ["a", "b"]
+      expect(observeHandler).toHaveBeenCalledWith config.get("foo.bar.baz"), {previous: ['b']}
+
   describe ".removeAtKeyPath(keyPath, value)", ->
     it "removes the given value from the array at the key path and updates observers", ->
       config.set("foo.bar.baz", ["a", "b", "c"])

spec/theme-manager-spec.coffee

@@ -15,7 +15,7 @@ describe "ThemeManager", ->
 
   describe "theme getters and setters", ->
     beforeEach ->
-      atom.packages.loadPackages()
+      atom.packages.loadPackages(sync: true)
 
     it 'getLoadedThemes get all the loaded themes', ->
       themes = themeManager.getLoadedThemes()

src/atom.coffee

@@ -54,7 +54,7 @@ class Atom
     @__defineGetter__ 'packageStates', => @packages.packageStates
     @__defineSetter__ 'packageStates', (packageStates) => @packages.packageStates = packageStates
 
-    @subscribe @packages, 'loaded', => @watchThemes()
+    @subscribe @packages, 'activated', => @watchThemes()
     @themes = new ThemeManager(@packages)
     @contextMenu = new ContextMenuManager(devMode)
     @menu = new MenuManager()
@@ -161,7 +161,9 @@ class Atom
 
   watchThemes: ->
     @themes.on 'reloaded', =>
-      pack.reloadStylesheets?() for name, pack of @packages.getActivePackages()
+      # Only reload stylesheets from non-theme packages
+      for pack in @packages.getActivePackages() when pack.getType() isnt 'theme'
+        pack.reloadStylesheets?()
       null
 
   open: (options) ->

src/config.coffee

@@ -176,6 +176,18 @@ class Config
     @set(keyPath, arrayValue)
     result
 
+  # Public: Add the value to the beginning of the array at the key path.
+  #
+  # keyPath - The {String} key path.
+  # value - The value to shift onto the array.
+  #
+  # Returns the new array length of the setting.
+  unshiftAtKeyPath: (keyPath, value) ->
+    arrayValue = @get(keyPath) ? []
+    result = arrayValue.unshift(value)
+    @set(keyPath, arrayValue)
+    result
+
   # Public: Remove the value from the array at the key path.
   #
   # keyPath - The {String} key path.

src/package-manager.coffee

@@ -63,6 +63,7 @@ class PackageManager
     for [activator, types] in @packageActivators
       packages = @getLoadedPackagesForTypes(types)
       activator.activatePackages(packages)
+    @emit 'activated'
 
   # Public: another type of package manager can handle other package types.
   # See ThemeManager
@@ -121,23 +122,27 @@ class PackageManager
 
     @observingDisabledPackages = true
 
-  loadPackages: ->
+  loadPackages: (options) ->
     # Ensure atom exports is already in the require cache so the load time
     # of the first package isn't skewed by being the first to require atom
     require '../exports/atom'
 
-    @loadPackage(name) for name in @getAvailablePackageNames() when not @isPackageDisabled(name)
+    packagePaths = @getAvailablePackagePaths()
+    packagePaths = packagePaths.filter (packagePath) => not @isPackageDisabled(path.basename(packagePath))
+    packagePaths = _.uniq packagePaths, (packagePath) -> path.basename(packagePath)
+    @loadPackage(packagePath, options) for packagePath in packagePaths
     @emit 'loaded'
 
-  loadPackage: (name, options) ->
-    if packagePath = @resolvePackagePath(name)
+  loadPackage: (nameOrPath, options) ->
+    if packagePath = @resolvePackagePath(nameOrPath)
+      name = path.basename(nameOrPath)
       return pack if pack = @getLoadedPackage(name)
 
       pack = Package.load(packagePath, options)
       @loadedPackages[pack.name] = pack if pack?
       pack
     else
-      throw new Error("Could not resolve '#{name}' to a package path")
+      throw new Error("Could not resolve '#{nameOrPath}' to a package path")
 
   unloadPackages: ->
     @unloadPackage(name) for name in _.keys(@loadedPackages)
@@ -190,8 +195,13 @@ class PackageManager
       for packagePath in fsUtils.listSync(packageDirPath)
         packagePaths.push(packagePath) if fsUtils.isDirectorySync(packagePath)
 
-    for packagePath in fsUtils.listSync(path.join(@resourcePath, 'node_modules'))
-      packagePaths.push(packagePath) if @isInternalPackage(packagePath)
+    try
+      metadataPath = path.join(@resourcePath, 'package.json')
+      {packageDependencies} = JSON.parse(fsUtils.read(metadataPath)) ? {}
+    packagesPath = path.join(@resourcePath, 'node_modules')
+    for packageName, packageVersion of packageDependencies ? {}
+      packagePath = path.join(packagesPath, packageName)
+      packagePaths.push(packagePath) if fsUtils.isDirectorySync(packagePath)
 
     _.uniq(packagePaths)
 

src/package.coffee

@@ -52,6 +52,6 @@ class Package
 
   # Private:
   measure: (key, fn) ->
-    startTime = new Date().getTime()
+    startTime = Date.now()
     fn()
-    @[key] = new Date().getTime() - startTime
+    @[key] = Date.now() - startTime

src/theme-package.coffee

@@ -11,9 +11,7 @@ class ThemePackage extends AtomPackage
   getStylesheetType: -> 'theme'
 
   enable: ->
-    themes = atom.config.get('core.themes')
-    themes = [@metadata.name].concat(themes)
-    atom.config.set('core.themes', themes)
+    atom.config.unshiftAtKeyPath('core.themes', @metadata.name)
 
   disable: ->
     atom.config.removeAtKeyPath('core.themes', @metadata.name)