Fixes issue dcaoyuan#176, puts the initialization of SBT console on t…

…he EDT
akochnev · Dec 18, 2016 · ffddc2e · ffddc2e
1 parent 7d39c65
commit ffddc2e
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/scala.sbt/src/main/scala/org/netbeans/modules/scala/sbt/console/SBTConsoleTopComponent.scala b/scala.sbt/src/main/scala/org/netbeans/modules/scala/sbt/console/SBTConsoleTopComponent.scala
@@ -307,27 +307,27 @@ object SBTConsoleTopComponent {
    * Obtain the SBTConsoleTopComponent instance by project
    */
   private def openInstance(project: Project, commands: List[String], isForceNew: Boolean, isDebug: Boolean, background: Boolean)(postAction: String => Unit) {
-    val (tc, isNewCreated) = if (isDebug) {
-      (SBTConsoleTopComponent(project, isDebug), true)
-    } else {
-      projectToDefault.get(project) match {
-        case None =>
-          val default = SBTConsoleTopComponent(project, isDebug)
-          projectToDefault.put(project, default)
-          (default, true)
-        case Some(tc) =>
-          if (isForceNew || tc.isRunningCommand) {
-            (SBTConsoleTopComponent(project, isDebug), true)
-          } else {
-            (tc, false)
-          }
-      }
-    }
-
-    tc.isRunningCommand = true
 
     val runnableTask = new Runnable() {
       def run {
+        val (tc, isNewCreated) = if (isDebug) {
+          (SBTConsoleTopComponent(project, isDebug), true)
+        } else {
+          projectToDefault.get(project) match {
+            case None =>
+              val default = SBTConsoleTopComponent(project, isDebug)
+              projectToDefault.put(project, default)
+              (default, true)
+            case Some(tc) =>
+              if (isForceNew || tc.isRunningCommand) {
+                (SBTConsoleTopComponent(project, isDebug), true)
+              } else {
+                (tc, false)
+              }
+          }
+        }
+
+        tc.isRunningCommand = true
 
         val progressHandle = ProgressHandle.createHandle("Running sbt commnad...",
           new Cancellable() {