Opt VCs nested in modules out of class-based-repl

dwijnand · dwijnand · commit 1588de1a0f6f · 2020-02-19T12:03:56.000Z
diff --git a/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/repl/scala/tools/nsc/interpreter/MemberHandlers.scala
@@ -198,18 +198,32 @@ trait MemberHandlers {
   class ModuleHandler(module: ModuleDef) extends MemberDefHandler(module) {
     override def definesTerm = Some(name.toTermName)
     override def definesValue = true
+    override def definesValueClass = {
+      var foundValueClass = false
+      new Traverser {
+        override def traverse(tree: Tree): Unit = tree match {
+          case _ if foundValueClass                 => ()
+          case cdef: ClassDef if isValueClass(cdef) => foundValueClass = true
+          case mdef: ModuleDef                      => traverseStats(mdef.impl.body, mdef.impl.symbol)
+          case _                                    => () // skip anything else
+        }
+      }.traverse(module)
+      foundValueClass
+    }
 
     override def resultExtractionCode(req: Request) = codegenln("defined object ", name)
   }
 
+  private def isValueClass(cdef: ClassDef) = cdef.impl.parents match {
+    case Ident(tpnme.AnyVal) :: _ => true // approximating with a syntactic check
+    case _                        => false
+  }
+
   class ClassHandler(member: ClassDef) extends MemberDefHandler(member) {
     override def definedSymbols = List(symbol, symbol.companionSymbol) filterNot (_ == NoSymbol)
     override def definesType = Some(name.toTypeName)
     override def definesTerm = Some(name.toTermName) filter (_ => mods.isCase)
-    override final def definesValueClass: Boolean = member.impl.parents match {
-      case Ident(tpnme.AnyVal) :: _ => true // approximating with a syntactic check
-      case _                        => false
-    }
+    override def definesValueClass = isValueClass(member)
 
     override def resultExtractionCode(req: Request) =
       codegenln("defined %s %s".format(keyword, name))
diff --git a/test/files/run/repl-class-based-value-class.check b/test/files/run/repl-class-based-value-class.check
@@ -5,4 +5,16 @@ defined class Meter
 scala> val x = new Meter(1)
 x: Meter = Meter@XXXXXXXX
 
+scala> object T { class Meter(val value: Int) extends AnyVal }
+defined object T
+
+scala> val y = new T.Meter(2)
+y: T.Meter = T$Meter@XXXXXXXX
+
+scala> object S { object T { class Meter(val value: Int) extends AnyVal } }
+defined object S
+
+scala> val z = new S.T.Meter(3)
+z: S.T.Meter = S$T$Meter@XXXXXXXX
+
 scala> :quit
diff --git a/test/files/run/repl-class-based-value-class.scala b/test/files/run/repl-class-based-value-class.scala
@@ -11,5 +11,9 @@ object Test extends ReplTest with Hashless {
   def code = """
     |class Meter(val value: Int) extends AnyVal
     |val x = new Meter(1)
+    |object T { class Meter(val value: Int) extends AnyVal }
+    |val y = new T.Meter(2)
+    |object S { object T { class Meter(val value: Int) extends AnyVal } }
+    |val z = new S.T.Meter(3)
     |""".stripMargin
 }
