Merge pull request #47 from learn-co/wait-to-activate

Only activate after primary package has completed activation
learn-co · May 12, 2017 · 2923404 · 2923404
2 parents 15d0606 + 37cc3cd
commit 2923404
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/lib/main.coffee b/lib/main.coffee
@@ -5,11 +5,17 @@ FileIcons = require './file-icons'
 
 nsync = require 'nsync-fs'
 nsyncInitializer = require './nsync/initializer'
+{primaryLearnIDEPackage} = require '../package.json'
 
 module.exports =
   treeView: null
 
-  activate: (@state) ->
+  activate: (state) ->
+    primaryPkg = atom.packages.loadPackage(primaryLearnIDEPackage)
+    primaryPkg.activate().then =>
+      @activateLearnIdeTree(state)
+
+  activateLearnIdeTree: (@state) ->
     @nsyncDisposables = nsyncInitializer(@state)
 
     @warnIfAtomsTreeViewIsActive()

diff --git a/lib/nsync/atom-helper.coffee b/lib/nsync/atom-helper.coffee
@@ -101,6 +101,10 @@ module.exports = helper =
         if value?
           resolve(value)
 
+  waitForTerminalConnection: ->
+    pkg = atom.packages.loadPackage(primaryLearnIDEPackage)
+    pkg.mainModule.getTermConnectionPromise()
+
   learnIdeVersion: ->
     if not LEARN_IDE_VERSION?
       pkg = atom.packages.loadPackage(primaryLearnIDEPackage)

diff --git a/lib/nsync/initializer.coffee b/lib/nsync/initializer.coffee
@@ -197,12 +197,13 @@ module.exports = helper = (activationState) ->
 
   disposables.forEach (disposable) -> composite.add(disposable)
 
-  atomHelper.getToken().then (token) ->
-    nsync.configure
-      expansionState: activationState.directoryExpansionStates
-      localRoot: _path.join(atom.configDirPath, '.learn-ide')
-      connection:
-        url: "#{WS_SERVER_URL}?token=#{token}&version=#{atomHelper.learnIdeVersion()}"
+  atomHelper.waitForTerminalConnection().then ->
+    atomHelper.getToken().then (token) ->
+      nsync.configure
+        expansionState: activationState.directoryExpansionStates
+        localRoot: _path.join(atom.configDirPath, '.learn-ide')
+        connection:
+          url: "#{WS_SERVER_URL}?token=#{token}&version=#{atomHelper.learnIdeVersion()}"
 
   return composite