From 93f5ab47800bad17cabaeda0efe2f3f080d81460 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 21 Nov 2017 13:11:22 -0800 Subject: [PATCH] Don't set TextEditor class's schedule in AtomEnvironment constructor We construct multiple AtomEnvironment instances in the tests. I don't know how the tests ever worked with this code in there. --- src/atom-environment.js | 1 - src/initialize-application-window.coffee | 1 + src/initialize-test-window.coffee | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/atom-environment.js b/src/atom-environment.js index 3f4d3c2a7..60f6cf6c8 100644 --- a/src/atom-environment.js +++ b/src/atom-environment.js @@ -71,7 +71,6 @@ class AtomEnvironment { this.deserializers = new DeserializerManager(this) this.deserializeTimings = {} this.views = new ViewRegistry(this) - TextEditor.setScheduler(this.views) this.notifications = new NotificationManager() this.stateStore = new StateStore('AtomEnvironments', 1) diff --git a/src/initialize-application-window.coffee b/src/initialize-application-window.coffee index 0c4c0a391..f8f670cf5 100644 --- a/src/initialize-application-window.coffee +++ b/src/initialize-application-window.coffee @@ -67,6 +67,7 @@ global.atom = new AtomEnvironment({ enablePersistence: true }) +TextEditor.setScheduler(global.atom.views) global.atom.preloadPackages() # Like sands through the hourglass, so are the days of our lives. diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee index 5ad10670a..c6aaada0e 100644 --- a/src/initialize-test-window.coffee +++ b/src/initialize-test-window.coffee @@ -82,6 +82,7 @@ module.exports = ({blobStore}) -> params.onlyLoadBaseStyleSheets = true unless params.hasOwnProperty("onlyLoadBaseStyleSheets") atomEnvironment = new AtomEnvironment(params) atomEnvironment.initialize(params) + TextEditor.setScheduler(atomEnvironment.views) atomEnvironment promise = testRunner({