From 7617c35856f29d81fc3e5096223fa8a0beb59fc2 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 8 Oct 2015 17:51:27 -0700
Subject: [PATCH] Rename AtomEnvironment::removeEditorWindow -> ::destroy

---
 spec/atom-environment-spec.coffee | 39 +++++++++++++++++--------------
 src/atom-environment.coffee       | 23 +++++++++---------
 src/window-event-handler.coffee   |  2 +-
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/spec/atom-environment-spec.coffee b/spec/atom-environment-spec.coffee
index 73b5a6e9d..a1847519b 100644
--- a/spec/atom-environment-spec.coffee
+++ b/spec/atom-environment-spec.coffee
@@ -1,9 +1,9 @@
-Exec = require('child_process').exec
+_ = require "underscore-plus"
 path = require 'path'
+temp = require 'temp'
 Package = require '../src/package'
 ThemeManager = require '../src/theme-manager'
-_ = require "underscore-plus"
-temp = require "temp"
+AtomEnvironment = require '../src/atom-environment'
 
 describe "AtomEnvironment", ->
   describe 'window sizing methods', ->
@@ -217,28 +217,33 @@ describe "AtomEnvironment", ->
 
   describe "::unloadEditorWindow()", ->
     it "saves the serialized state of the window so it can be deserialized after reload", ->
-      workspaceState = atom.workspace.serialize()
-      grammarsState = {grammarOverridesByPath: atom.grammars.grammarOverridesByPath}
-      projectState = atom.project.serialize()
+      atomEnvironment = new AtomEnvironment
+      spyOn(atomEnvironment, 'saveStateSync')
 
-      atom.unloadEditorWindow()
+      workspaceState = atomEnvironment.workspace.serialize()
+      grammarsState = {grammarOverridesByPath: atomEnvironment.grammars.grammarOverridesByPath}
+      projectState = atomEnvironment.project.serialize()
 
-      expect(atom.state.workspace).toEqual workspaceState
-      expect(atom.state.grammars).toEqual grammarsState
-      expect(atom.state.project).toEqual projectState
-      expect(atom.saveStateSync).toHaveBeenCalled()
+      atomEnvironment.unloadEditorWindow()
 
-  describe "::removeEditorWindow()", ->
+      expect(atomEnvironment.state.workspace).toEqual workspaceState
+      expect(atomEnvironment.state.grammars).toEqual grammarsState
+      expect(atomEnvironment.state.project).toEqual projectState
+      expect(atomEnvironment.saveStateSync).toHaveBeenCalled()
+
+  describe "::destroy()", ->
     it "unsubscribes from all buffers", ->
+      atomEnvironment = new AtomEnvironment
+
       waitsForPromise ->
-        atom.workspace.open("sample.js")
+        atomEnvironment.workspace.open("sample.js")
 
       runs ->
-        buffer = atom.workspace.getActivePaneItem().buffer
-        pane = atom.workspace.getActivePane()
+        buffer = atomEnvironment.workspace.getActivePaneItem().buffer
+        pane = atomEnvironment.workspace.getActivePane()
         pane.splitRight(copyActiveItem: true)
-        expect(atom.workspace.getTextEditors().length).toBe 2
+        expect(atomEnvironment.workspace.getTextEditors().length).toBe 2
 
-        atom.removeEditorWindow()
+        atomEnvironment.destroy()
 
         expect(buffer.getSubscriptionCount()).toBe 0
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 29d9fcb57..b4af72fc7 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -255,6 +255,17 @@ class AtomEnvironment extends Model
 
     @packages.serviceHub.clear()
 
+  destroy: ->
+    return if not @project
+
+    @workspace?.destroy()
+    @workspace = null
+    @themes.workspace = null
+    @project?.destroy()
+    @project = null
+
+    @windowEventHandler?.unsubscribe()
+
   ###
   Section: Event Subscription
   ###
@@ -604,18 +615,6 @@ class AtomEnvironment extends Model
     @state.packageStates = @packages.packageStates
     @state.fullScreen = @isFullScreen()
     @saveStateSync()
-    @windowState = null
-
-  removeEditorWindow: ->
-    return if not @project
-
-    @workspace?.destroy()
-    @workspace = null
-    @themes.workspace = null
-    @project?.destroy()
-    @project = null
-
-    @windowEventHandler?.unsubscribe()
 
   openInitialEmptyEditorIfNecessary: ->
     return unless @config.get('core.openEmptyEditorOnStart')
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index ceb9c126e..16d5cfd0c 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -187,7 +187,7 @@ class WindowEventHandler
     confirmed
 
   handleWindowUnload: =>
-    @atomEnv.removeEditorWindow()
+    @atomEnv.destroy()
 
   handleWindowToggleFullScreen: =>
     @atomEnv.toggleFullScreen()