Now :t types declarations as well as expression...

Now :t types declarations as well as expressions, and cleans up the
output the same way the repl does so stray unsolved type constraints
don't befuddle anyone. Closes #4391, no review.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index d83076f0be..dc2a653c83 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -419,13 +419,11 @@ class ILoop(in0: Option[BufferedReader], protected val out: PrintWriter)
     try newJavap()
     catch { case _: Exception => null }
 
-  // TODO: unsolved types shouldn't make it out of this alive.
-  //
-  // scala> :t Some(Set(1)) getOrElse Set("abc")
-  // scala.collection.immutable.Set[_ >: ? <: ?]
+  // Still todo: modules.
   private def typeCommand(line: String): Result = {
-    intp.typeOfExpression(line, false) match {
-      case Some(tp) => tp.toString
+    if (line.trim == "") ":type <expression>"
+    else intp.typeOfExpression(line, false) match {
+      case Some(tp) => intp.afterTyper(tp.toString)
       case _        => "" // the error message was already printed
     }
   }