Scaladoc comment position fixes with tests; sca...

Scaladoc comment position fixes with tests; scaladoc comment postions
are now accessible by symbol; respond retry in interactive Global is now
handled properly.

1 files changed, 12 insertions, 10 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index b0b82e5743..8444065004 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -200,6 +200,7 @@ self =>
           outOfDate = false
           compileRunner = newRunnerThread
           ex match {
+            case _ : FreshRunReq =>   // This shouldn't be reported
             case _ : ValidateError => // This will have been reported elsewhere
             case _ => ex.printStackTrace(); inform("Fatal Error: "+ex)
           }
@@ -265,16 +266,17 @@ self =>
   // ----------------- Implementations of client commmands -----------------------
 
   def respond[T](result: Response[T])(op: => T): Unit =
-    while(true)
-      try {
-        result set Left(op)
-        return
-      } catch {
-        case ex : ControlException =>
-        case ex =>
-          result set Right(ex)
-          throw ex
-      }
+    try {
+      result set Left(op)
+      return
+    } catch {
+      case ex : FreshRunReq =>
+        scheduler.postWorkItem(() => respond(result)(op))
+        throw ex
+      case ex =>
+        result set Right(ex)
+        throw ex
+    }
 
   /** Make sure a set of compilation units is loaded and parsed */
   def reloadSources(sources: List[SourceFile]) {