# HG changeset patch
# User wenzelm
# Date 1399062171 -7200
# Node ID a752f065f3d3d1556c3f86296541c4046c6c3d75
# Parent  d0a57abc71f8d6f4c7234f99fc6f5e716eab3dc7
fork Scala interpreter thread, independently of Swing_Thread;

diff -r d0a57abc71f8 -r a752f065f3d3 src/Tools/jEdit/src/plugin.scala
--- a/src/Tools/jEdit/src/plugin.scala	Fri May 02 20:41:01 2014 +0200
+++ b/src/Tools/jEdit/src/plugin.scala	Fri May 02 22:22:51 2014 +0200
@@ -147,7 +147,7 @@
 
   /* current document content */
 
-  def snapshot(view: View): Document.Snapshot =
+  def snapshot(view: View): Document.Snapshot = Swing_Thread.now
   {
     val buffer = view.getBuffer
     document_model(buffer) match {
@@ -156,7 +156,7 @@
     }
   }
 
-  def rendering(view: View): Rendering =
+  def rendering(view: View): Rendering = Swing_Thread.now
   {
     val text_area = view.getTextArea
     document_view(text_area) match {
diff -r d0a57abc71f8 -r a752f065f3d3 src/Tools/jEdit/src/scala_console.scala
--- a/src/Tools/jEdit/src/scala_console.scala	Fri May 02 20:41:01 2014 +0200
+++ b/src/Tools/jEdit/src/scala_console.scala	Fri May 02 22:22:51 2014 +0200
@@ -59,7 +59,8 @@
 
   /* global state -- owned by Swing thread */
 
-  private var interpreters = Map[Console, IMain]()
+  private abstract class Request
+  private var interpreters = Map[Console, Consumer_Thread[Request]]()
 
   private var global_console: Console = null
   private var global_out: Output = null
@@ -72,8 +73,10 @@
     {
       val s = buf.synchronized { val s = buf.toString; buf.setLength(0); s }
       val str = UTF8.decode_permissive(s)
-      if (global_out == null) System.out.print(str)
-      else Swing_Thread.now { global_out.writeAttrs(null, str) }
+      Swing_Thread.later {
+        if (global_out == null) System.out.print(str)
+        else global_out.writeAttrs(null, str)
+      }
     }
     override def close() { flush () }
     def write(byte: Int) {
@@ -121,13 +124,17 @@
   private def report_error(str: String)
   {
     if (global_console == null || global_err == null) System.err.println(str)
-    else Swing_Thread.now { global_err.print(global_console.getErrorColor, str) }
+    else Swing_Thread.later { global_err.print(global_console.getErrorColor, str) }
   }
 
 
-  /* jEdit console methods */
+  /* interpreter thread */
 
-  override def openConsole(console: Console)
+  private case class Start(console: Console) extends Request
+  private case class Execute(console: Console, out: Output, err: Output, command: String)
+    extends Request
+
+  private def fork_interpreter(): Consumer_Thread[Request] =
   {
     val settings = new GenericRunnerSettings(report_error)
     settings.classpath.value = reconstruct_classpath()
@@ -137,16 +144,44 @@
       override def parentClassLoader = new JARClassLoader
     }
     interp.setContextClassLoader
-    interp.bind("view", "org.gjt.sp.jedit.View", console.getView)
-    interp.bind("console", "console.Console", console)
-    interp.interpret("import isabelle.jedit.PIDE")
+
+    Consumer_Thread.fork[Request]("Scala_Console") {
+      case Start(console) =>
+        interp.bind("view", "org.gjt.sp.jedit.View", console.getView)
+        interp.bind("console", "console.Console", console)
+        interp.interpret("import isabelle.jedit.PIDE")
+        true
 
+      case Execute(console, out, err, command) =>
+        with_console(console, out, err) {
+          interp.interpret(command)
+          Swing_Thread.later {
+            if (err != null) err.commandDone()
+            out.commandDone()
+          }
+          true
+        }
+    }
+  }
+
+
+  /* jEdit console methods */
+
+  override def openConsole(console: Console)
+  {
+    val interp = fork_interpreter()
+    interp.send(Start(console))
     interpreters += (console -> interp)
   }
 
   override def closeConsole(console: Console)
   {
-    interpreters -= console
+    interpreters.get(console) match {
+      case Some(interp) =>
+        interp.shutdown
+        interpreters -= console
+      case None =>
+    }
   }
 
   override def printInfoMessage(out: Output)
@@ -167,10 +202,7 @@
 
   override def execute(console: Console, input: String, out: Output, err: Output, command: String)
   {
-    val interp = interpreters(console)
-    with_console(console, out, err) { interp.interpret(command) }
-    if (err != null) err.commandDone()
-    out.commandDone()
+    interpreters(console).send(Execute(console, out, err, command))
   }
 
   override def stop(console: Console)