Fix to :javap so repl-defined objects as well a...

Fix to :javap so repl-defined objects as well as classes will be found.
Even case classes:

  scala> case class Bippy(x: Int, y: Int)
  defined class Bippy

  scala> :javap Bippy
  Compiled from "<console>"
  public class Bippy extends java.lang.Object implements scala.ScalaObject,scala.Product,scala.Serializable{
    ...
  scala> :javap Bippy$
  Compiled from "<console>"
  public final class Bippy$ extends scala.runtime.AbstractFunction2 implements scala.ScalaObject,scala.Serializable{
    ...

No review.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index 38084af016..6a512f3a92 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -302,7 +302,17 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
   }
 
   private object javap extends Javap(intp.classLoader, new IMain.ReplStrippingWriter(intp)) {
-    override def tryClass(path: String): Array[Byte] = super.tryClass(intp pathToFlatName path)
+    override def tryClass(path: String): Array[Byte] = {
+      // Look for Foo first, then Foo$, but if Foo$ is given explicitly,
+      // we have to drop the $ to find object Foo, then tack it back onto
+      // the end of the flattened name.
+      def className  = intp pathToFlatName path
+      def moduleName = (intp pathToFlatName path.stripSuffix("$")) + "$"
+
+      val bytes = super.tryClass(className)
+      if (bytes.nonEmpty) bytes
+      else super.tryClass(moduleName)
+    }
   }
 
   private def javapCommand(line: String): Result = {