From d0e1505a0f477cc59218bdd84dc0eb0f9cafdcb4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 2 Oct 2015 12:53:23 -0600 Subject: [PATCH] Inline deserializePackageStates into loadStateSync Signed-off-by: Max Brunsfeld --- src/atom.coffee | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index e6f92eee8..a6624c5bb 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -666,15 +666,10 @@ class Atom extends Model @keymaps.defaultTarget = workspaceElement document.querySelector(@workspaceParentSelectorctor).appendChild(workspaceElement) - deserializePackageStates: -> - @packages.packageStates = @state.packageStates ? {} - delete @state.packageStates - deserializeEditorWindow: -> if grammarOverridesByPath = @state.grammars?.grammarOverridesByPath @grammars.grammarOverridesByPath = grammarOverridesByPath - @deserializePackageStates() @deserializeWorkspace() loadThemes: -> @@ -736,6 +731,8 @@ class Atom extends Model @deserializeTimings.atom = Date.now() - startTime + @packages.packageStates = @state.packageStates ? {} + startTime = Date.now() @project.deserialize(@state.project, @deserializers) if @state.project? @deserializeTimings.project = Date.now() - startTime