Fixed instrumentation code so that it can deal with:

1. leading imports: object sheet { import math; … }
2. trailing objects: object sheet { … } object other { … }

Review by @dragos

1 files changed, 7 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
index dfbbb6ff88..7d332d9f7f 100644
--- a/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
+++ b/src/compiler/scala/tools/nsc/interactive/ScratchPadMaker.scala
@@ -35,7 +35,7 @@ trait ScratchPadMaker { self: Global =>
 
     private def literal(str: String) = "\"\"\""+str+"\"\"\""
 
-    private val prologue = "import scala.runtime.WorksheetSupport._; def main(args: Array[String])=$execute{"
+    private val prologue = ";import scala.runtime.WorksheetSupport._; def main(args: Array[String])=$execute{"
 
     private val epilogue = "}"
 
@@ -117,12 +117,13 @@ trait ScratchPadMaker { self: Global =>
         super.traverse(tree)
       case ModuleDef(_, name, Template(_, _, body)) =>
         val topLevel = objectName.isEmpty
-        if (topLevel) objectName = tree.symbol.fullName
-        body foreach traverseStat
-        if (skipped != 0) { // don't issue prologue and epilogue if there are no instrumented statements
-          applyPendingPatches(skipped)
-          if (topLevel)
+        if (topLevel) {
+          objectName = tree.symbol.fullName
+          body foreach traverseStat
+          if (skipped != 0) { // don't issue prologue and epilogue if there are no instrumented statements
+            applyPendingPatches(skipped)
             patches += Patch(skipped, epilogue)
+          }
         }
       case _ =>
     }