Make project a global and refactor startup process

src/app/atom.coffee

@@ -16,6 +16,9 @@ _.extend atom,
   activatedAtomPackages: []
   atomPackageStates: {}
 
+  getPathToOpen: ->
+    @getWindowState('pathToOpen') ? window.location.params.pathToOpen
+
   activateAtomPackage: (pack) ->
     @activatedAtomPackages.push(pack)
     pack.packageMain.activate(@atomPackageStates[pack.name] ? {})

src/app/config.coffee

@@ -33,9 +33,8 @@ class Config
   load: ->
     @loadUserConfig()
     @requireUserInitScript()
-    atom.loadThemes()
-    atom.loadPackages()
-    keymap.loadUserKeymaps()
+
+
 
   loadUserConfig: ->
     if fs.exists(@configFilePath)

src/app/keymap.coffee

@@ -63,7 +63,7 @@ class Keymap
 
     keystrokeMap
 
-  handleKeyEvent: (event) ->
+  handleKeyEvent: (event) =>
     event.keystrokes = @multiKeystrokeStringForEvent(event)
     isMultiKeystroke = @queuedKeystrokes?
     @queuedKeystrokes = null

src/app/root-view.coffee

@@ -25,15 +25,9 @@ class RootView extends View
         @div id: 'vertical', outlet: 'vertical', =>
           @div id: 'panes', outlet: 'panes'
 
-  @deserialize: ({ projectState, panesViewState, packageStates, projectPath }) ->
-    if projectState
-      projectOrPathToOpen = Project.deserialize(projectState)
-    else
-      projectOrPathToOpen = projectPath # This will migrate people over to the new project serialization scheme. It should be removed eventually.
-
+  @deserialize: ({ panesViewState, packageStates, projectPath }) ->
     atom.atomPackageStates = packageStates ? {}
-
-    rootView = new RootView(projectOrPathToOpen, suppressOpen: true)
+    rootView = new RootView(null, suppressOpen: true)
     rootView.setRootPane(deserialize(panesViewState)) if panesViewState
     rootView
 
@@ -44,23 +38,23 @@ class RootView extends View
     window.rootView = this
     @handleEvents()
 
+    @project = window.project
+
     if not projectOrPathToOpen or _.isString(projectOrPathToOpen)
       pathToOpen = projectOrPathToOpen
-      @project = new Project(projectOrPathToOpen)
     else
-      @project = projectOrPathToOpen
       pathToOpen = @project?.getPath()
     @pathToOpenIsFile = pathToOpen and fs.isFile(pathToOpen)
 
     config.load()
 
-    if pathToOpen
-      @open(pathToOpen) if @pathToOpenIsFile and not suppressOpen
-    else
-      @open()
+    unless suppressOpen
+      if pathToOpen
+        @open(pathToOpen) if @pathToOpenIsFile
+      else
+        @open()
 
   serialize: ->
-    projectState: @project?.serialize()
     panesViewState: @panes.children().view()?.serialize()
     packageStates: atom.serializeAtomPackages()
 
@@ -113,7 +107,6 @@ class RootView extends View
     @focus() if onDom
 
   deactivate: ->
-    atom.setRootViewStateForPath(@project.getPath(), @serialize())
     atom.deactivateAtomPackages()
     @remove()
 

src/app/window.coffee

@@ -3,9 +3,6 @@
 
 fs = require 'fs'
 $ = require 'jquery'
-Config = require 'config'
-Syntax = require 'syntax'
-Pasteboard = require 'pasteboard'
 require 'jquery-extensions'
 require 'underscore-extensions'
 require 'space-pen-extensions'
@@ -20,15 +17,22 @@ windowAdditions =
 
   # This method runs when the file is required. Any code here will run
   # in all environments: spec, benchmark, and application
-  startup: ->
-    @config = new Config
-    @syntax = new Syntax
-    @setUpKeymap()
-    @pasteboard = new Pasteboard
-    @setUpEventHandlers()
+  setUpEnvironment: ->
+    Config = require 'config'
+    Syntax = require 'syntax'
+    Pasteboard = require 'pasteboard'
+    Keymap = require 'keymap'
+
+    window.config = new Config
+    window.syntax = new Syntax
+    window.pasteboard = new Pasteboard
+    window.keymap = new Keymap()
+    $(document).on 'keydown', keymap.handleKeyEvent
+    keymap.bindDefaultKeys()
 
-  setUpEventHandlers: ->
     $(window).on 'core:close', => @close()
+
+  handleWindowEvents: ->
     $(window).command 'window:close', => @close()
     $(window).command 'window:toggle-full-screen', => atom.toggleFullScreen()
     $(window).on 'focus', -> $("body").removeClass('is-blurred')
@@ -37,37 +41,36 @@ windowAdditions =
   # This method is intended only to be run when starting a normal application
   # Note: RootView assigns itself on window on initialization so that
   # window.rootView is available when loading user configuration
-  attachRootView: (pathToOpen) ->
-    RootView = require 'root-view'
-    if pathState = atom.getRootViewStateForPath(pathToOpen)
-      RootView.deserialize(pathState)
-    else
-      new RootView(pathToOpen)
-
-    $(@rootViewParentSelector).append(@rootView)
+  startApplication: ->
+    config.load()
+    buildProjectAndRootView()
+    keymap.loadBundledKeymaps()
+    keymap.loadUserKeymaps()
+    atom.loadThemes()
+    atom.loadPackages()
+    $(window).on 'beforeunload', -> stopApplication(); false
     $(window).focus()
-    $(window).on 'beforeunload', =>
-      @shutdown()
-      false
 
-  shutdown: ->
-    if @rootView
-      atom.setWindowState('pathToOpen', @rootView.project.getPath())
-      @rootView.deactivate()
-      @rootView = null
-    $(window).off('focus')
-    $(window).off('blur')
-    $(window).off('before')
+  buildProjectAndRootView: ->
+    RootView = require 'root-view'
+    Project = require 'project'
 
-  setUpKeymap: ->
-    Keymap = require 'keymap'
+    if windowState = atom.getRootViewStateForPath(atom.getPathToOpen()) and windowState?.project?
+      window.project = deserialize(windowState.project)
+      window.rootView = deserialize(windowState.rootView)
+    else
+      window.project = new Project(atom.getPathToOpen())
+      window.rootView = new RootView(atom.getPathToOpen())
+    $(rootViewParentSelector).append(rootView)
 
-    @keymap = new Keymap()
-    @keymap.bindDefaultKeys()
-    @keymap.loadBundledKeymaps()
-
-    @_handleKeyEvent = (e) => @keymap.handleKeyEvent(e)
-    $(document).on 'keydown', @_handleKeyEvent
+  stopApplication: ->
+    atom.setWindowState('pathToOpen', rootView.project.getPath())
+    atom.setRootViewStateForPath project.getPath(),
+      project: project.serialize()
+      rootView: rootView.serialize()
+    rootView.deactivate()
+    project.destroy()
+    $(window).off('focus blur before')
 
   stylesheetElementForId: (id) ->
     $("head style[id='#{id}']")
@@ -121,7 +124,7 @@ windowAdditions =
     value
 
 window[key] = value for key, value of windowAdditions
-window.startup()
+window.setUpEnvironment()
 
 requireStylesheet 'reset.css'
 requireStylesheet 'atom.css'

src/packages/autocomplete/spec/autocomplete-spec.coffee

@@ -48,6 +48,7 @@ describe "AutocompleteView", ->
     miniEditor = autocomplete.miniEditor
 
   afterEach ->
+    rootView.deactivate()
     editor?.remove()
 
   describe 'autocomplete:attach event', ->

src/packages/autoflow/spec/autoflow-spec.coffee

@@ -4,7 +4,7 @@ describe "Autoflow package", ->
   editor = null
 
   beforeEach ->
-    rootView = new RootView
+    new RootView
     window.loadPackage 'autoflow'
     editor = rootView.getActiveEditor()
     config.set('editor.preferredLineLength', 30)

src/packages/markdown-preview/spec/markdown-preview-spec.coffee

@@ -5,7 +5,8 @@ _ = require 'underscore'
 
 describe "MarkdownPreview", ->
   beforeEach ->
-    rootView = new RootView(require.resolve('fixtures/markdown'))
+    project.setPath(project.resolve('markdown'))
+    rootView = new RootView(project.getPath())
     window.loadPackage("markdown-preview")
     spyOn(MarkdownPreview.prototype, 'loadHtml')
 

src/packages/snippets/spec/snippets-spec.coffee

@@ -10,7 +10,7 @@ Package = require 'package'
 describe "Snippets extension", ->
   [buffer, editor, editSession] = []
   beforeEach ->
-    rootView = new RootView(require.resolve('fixtures/sample.js'))
+    new RootView(project.resolve('sample.js'))
     spyOn(LoadSnippetsTask.prototype, 'start')
 
     packageWithSnippets = window.loadPackage("package-with-snippets")

src/packages/tree-view/spec/tree-view-spec.coffee

@@ -6,11 +6,11 @@ Directory = require 'directory'
 fs = require 'fs'
 
 describe "TreeView", ->
-  [project, treeView, sampleJs, sampleTxt] = []
+  [treeView, sampleJs, sampleTxt] = []
 
   beforeEach ->
-    new RootView(require.resolve('fixtures/tree-view'))
-    project = rootView.project
+    project.setPath(project.resolve('tree-view'))
+    new RootView(project.getPath())
 
     window.loadPackage("tree-view")
     rootView.trigger 'tree-view:toggle'
@@ -48,6 +48,7 @@ describe "TreeView", ->
 
     describe "when the project has no path", ->
       beforeEach ->
+        project.setPath(undefined)
         rootView.deactivate()
         new RootView()
         treeView = window.loadPackage("tree-view").packageMain.createView()
@@ -605,8 +606,8 @@ describe "TreeView", ->
       fs.makeDirectory(dirPath)
       fs.write(filePath, "doesn't matter")
 
+      project.setPath(rootDirPath)
       new RootView(rootDirPath)
-      project = rootView.project
       window.loadPackage('tree-view')
       rootView.trigger 'tree-view:toggle'
       treeView = rootView.find(".tree-view").view()

src/window-bootstrap.coffee

@@ -3,7 +3,6 @@ date = new Date().getTime()
 require 'atom'
 require 'window'
 
-pathToOpen = atom.getWindowState('pathToOpen') ? window.location.params.pathToOpen
-window.attachRootView(pathToOpen)
+window.startApplication()
 atom.show()
 console.log "Load time: #{new Date().getTime() - date}"