Merge pull request #862 from kasiaMarek/eval-for-empty-package

fix: correctly load class with an empty package from mirror

Author: tgodzik

modules/expression-compiler/src/main/scala-2/scala/tools/nsc/evaluation/ExpressionGlobal.scala

@@ -52,7 +52,7 @@ private[nsc] class ExpressionGlobal(
 
   // definitions
   lazy val expressionClass: ClassSymbol =
-    if (pckg.isEmpty) rootMirror.getRequiredClass(expressionClassName.toString)
+    if (pckg.isEmpty) rootMirror.staticClass(expressionClassName.toString())
     else rootMirror.getRequiredClass(s"$pckg.$expressionClassName")
   lazy val evaluate: TermSymbol = expressionDecl("evaluate")
   lazy val reflectEval: TermSymbol = expressionDecl("reflectEval")

modules/tests/src/test/scala/ch/epfl/scala/debugadapter/ScalaEvaluationTests.scala

@@ -2759,4 +2759,20 @@ abstract class ScalaEvaluationTests(scalaVersion: ScalaVersion) extends DebugTes
       Evaluation.success("1 + 2", 3)
     )
   }
+
+  test("empty package") {
+    val source =
+      """|object Main {
+         |  def main(args: Array[String]): Unit = {
+         |    println(1 + 2)
+         |  }
+         |}
+         |""".stripMargin
+    implicit val debuggee: TestingDebuggee =
+      TestingDebuggee.mainClass(source, "Main", scalaVersion)
+    check(
+      Breakpoint(3),
+      Evaluation.success("List(1,2,3).head", 1)
+    )
+  }
 }