Selective dealiasing when printing errors.

*** Important note for busy commit log skimmers ***

Symbol method "fullName" has been trying to serve the dual role of "how
to print a symbol" and "how to find a class file." It cannot serve both
these roles simultaneously, primarily because of package objects but
other little things as well. Since in the majority of situations we want
the one which corresponds to the idealized scala world, not the grubby
bytecode, I went with that for fullName. When you require the path to a
class (e.g. you are calling Class.forName) you should use javaClassName.

  package foo { package object bar { class Bippy } }

If sym is Bippy's symbol, then

       sym.fullName == foo.bar.Bippy
  sym.javaClassName == foo.bar.package.Bippy

*** End important note ***

There are many situations where we (until now) forewent revealing
everything we knew about a type mismatch. For instance, this isn't very
helpful of scalac (at least in those more common cases where you didn't
define type X on the previous repl line.)

  scala> type X = Int
  defined type alias X

  scala> def f(x: X): Byte = x
  <console>:8: error: type mismatch;
   found   : X
   required: Byte
         def f(x: X): Byte = x
                             ^
Now it says:

   found   : X
      (which expands to)  Int
   required: Byte
         def f(x: X): Byte = x
                             ^

In addition I rearchitected a number of methods involving:

 - finding a symbol's owner
 - calculating a symbol's name
 - determining whether to print a prefix

No review.

9 files changed, 143 insertions, 141 deletions

diff --git a/test/files/presentation/akka.check b/test/files/presentation/akka.check
index 44d40be17a..d24d3d5711 100644
--- a/test/files/presentation/akka.check
+++ b/test/files/presentation/akka.check
@@ -15,12 +15,12 @@ retrieved 43 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(akka.routing.Routing.type, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method dispatcherActor(routing: akka.routing.Routing.PF[Any,akka.actor.ActorRef])akka.actor.ActorRef`
 `method dispatcherActor(routing: akka.routing.Routing.PF[Any,akka.actor.ActorRef], msgTransformer: Any => Any)akka.actor.ActorRef`
 `method ensuring(cond: Boolean)akka.routing.Routing.type`
@@ -41,7 +41,7 @@ retrieved 43 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -62,7 +62,7 @@ retrieved 129 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(akka.actor.ActorRef, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
@@ -72,7 +72,7 @@ retrieved 129 members
 `method actorInstance=> java.util.concurrent.atomic.AtomicReference[akka.actor.Actor]`
 `method asInstanceOf[T0]=> T0`
 `method channel=> akka.actor.Channel[Any]`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method compareTo(other: akka.actor.ActorRef)Int`
 `method dispatcher=> akka.dispatch.MessageDispatcher`
 `method dispatcher_=(md: akka.dispatch.MessageDispatcher)Unit`
@@ -95,14 +95,14 @@ retrieved 129 members
 `method getHomeAddress()java.net.InetSocketAddress`
 `method getId()String`
 `method getLifeCycle()akka.config.Supervision.LifeCycle`
-`method getLinkedActors()java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method getLinkedActors()java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method getMailboxSize()Int`
 `method getReceiveTimeout()Option[Long]`
 `method getSender()Option[akka.actor.ActorRef]`
 `method getSenderFuture()Option[akka.dispatch.CompletableFuture[Any]]`
 `method getSupervisor()akka.actor.ActorRef`
 `method getTimeout()Long`
-`method getUuid()akka.actor.package.Uuid`
+`method getUuid()akka.actor.Uuid`
 `method handleTrapExit(dead: akka.actor.ActorRef, reason: Throwable)Unit`
 `method hashCode()Int`
 `method homeAddress=> Option[java.net.InetSocketAddress]`
@@ -116,7 +116,7 @@ retrieved 129 members
 `method isShutdown=> Boolean`
 `method isUnstarted=> Boolean`
 `method link(actorRef: akka.actor.ActorRef)Unit`
-`method linkedActors=> java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method linkedActors=> java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method mailbox=> AnyRef`
 `method mailboxSize=> Int`
 `method mailbox_=(value: AnyRef)AnyRef`
@@ -125,7 +125,7 @@ retrieved 129 members
 `method notifyAll()Unit`
 `method postMessageToMailbox(message: Any, senderOption: Option[akka.actor.ActorRef])Unit`
 `method postMessageToMailboxAndCreateFutureResultWithTimeout[T](message: Any, timeout: Long, senderOption: Option[akka.actor.ActorRef], senderFuture: Option[akka.dispatch.CompletableFuture[T]])akka.dispatch.CompletableFuture[T]`
-`method registerSupervisorAsRemoteActor=> Option[akka.actor.package.Uuid]`
+`method registerSupervisorAsRemoteActor=> Option[akka.actor.Uuid]`
 `method reply(message: Any)Unit`
 `method replySafe(message: AnyRef)Boolean`
 `method replyUnsafe(message: AnyRef)Unit`
@@ -162,10 +162,10 @@ retrieved 129 members
 `method supervisor=> Option[akka.actor.ActorRef]`
 `method supervisor_=(sup: Option[akka.actor.ActorRef])Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method unlink(actorRef: akka.actor.ActorRef)Unit`
-`method uuid=> akka.actor.package.Uuid`
-`method uuid_=(uid: akka.actor.package.Uuid)Unit`
+`method uuid=> akka.actor.Uuid`
+`method uuid_=(uid: akka.actor.Uuid)Unit`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -173,7 +173,7 @@ retrieved 129 members
 `value selfAny`
 `value xakka.actor.ActorRef`
 `variable _statusakka.actor.ActorRefInternals.StatusType`
-`variable _uuidakka.actor.package.Uuid`
+`variable _uuidakka.actor.Uuid`
 `variable currentMessageakka.dispatch.MessageInvocation`
 `variable faultHandlerakka.config.Supervision.FaultHandlingStrategy`
 `variable hotswapscala.collection.immutable.Stack[PartialFunction[Any,Unit]]`
@@ -193,7 +193,7 @@ retrieved 129 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(akka.actor.ActorRef, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
@@ -203,7 +203,7 @@ retrieved 129 members
 `method actorInstance=> java.util.concurrent.atomic.AtomicReference[akka.actor.Actor]`
 `method asInstanceOf[T0]=> T0`
 `method channel=> akka.actor.Channel[Any]`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method compareTo(other: akka.actor.ActorRef)Int`
 `method dispatcher=> akka.dispatch.MessageDispatcher`
 `method dispatcher_=(md: akka.dispatch.MessageDispatcher)Unit`
@@ -226,14 +226,14 @@ retrieved 129 members
 `method getHomeAddress()java.net.InetSocketAddress`
 `method getId()String`
 `method getLifeCycle()akka.config.Supervision.LifeCycle`
-`method getLinkedActors()java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method getLinkedActors()java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method getMailboxSize()Int`
 `method getReceiveTimeout()Option[Long]`
 `method getSender()Option[akka.actor.ActorRef]`
 `method getSenderFuture()Option[akka.dispatch.CompletableFuture[Any]]`
 `method getSupervisor()akka.actor.ActorRef`
 `method getTimeout()Long`
-`method getUuid()akka.actor.package.Uuid`
+`method getUuid()akka.actor.Uuid`
 `method handleTrapExit(dead: akka.actor.ActorRef, reason: Throwable)Unit`
 `method hashCode()Int`
 `method homeAddress=> Option[java.net.InetSocketAddress]`
@@ -247,7 +247,7 @@ retrieved 129 members
 `method isShutdown=> Boolean`
 `method isUnstarted=> Boolean`
 `method link(actorRef: akka.actor.ActorRef)Unit`
-`method linkedActors=> java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method linkedActors=> java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method mailbox=> AnyRef`
 `method mailboxSize=> Int`
 `method mailbox_=(value: AnyRef)AnyRef`
@@ -256,7 +256,7 @@ retrieved 129 members
 `method notifyAll()Unit`
 `method postMessageToMailbox(message: Any, senderOption: Option[akka.actor.ActorRef])Unit`
 `method postMessageToMailboxAndCreateFutureResultWithTimeout[T](message: Any, timeout: Long, senderOption: Option[akka.actor.ActorRef], senderFuture: Option[akka.dispatch.CompletableFuture[T]])akka.dispatch.CompletableFuture[T]`
-`method registerSupervisorAsRemoteActor=> Option[akka.actor.package.Uuid]`
+`method registerSupervisorAsRemoteActor=> Option[akka.actor.Uuid]`
 `method reply(message: Any)Unit`
 `method replySafe(message: AnyRef)Boolean`
 `method replyUnsafe(message: AnyRef)Unit`
@@ -293,10 +293,10 @@ retrieved 129 members
 `method supervisor=> Option[akka.actor.ActorRef]`
 `method supervisor_=(sup: Option[akka.actor.ActorRef])Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method unlink(actorRef: akka.actor.ActorRef)Unit`
-`method uuid=> akka.actor.package.Uuid`
-`method uuid_=(uid: akka.actor.package.Uuid)Unit`
+`method uuid=> akka.actor.Uuid`
+`method uuid_=(uid: akka.actor.Uuid)Unit`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -304,7 +304,7 @@ retrieved 129 members
 `value selfAny`
 `value xakka.actor.ActorRef`
 `variable _statusakka.actor.ActorRefInternals.StatusType`
-`variable _uuidakka.actor.package.Uuid`
+`variable _uuidakka.actor.Uuid`
 `variable currentMessageakka.dispatch.MessageInvocation`
 `variable faultHandlerakka.config.Supervision.FaultHandlingStrategy`
 `variable hotswapscala.collection.immutable.Stack[PartialFunction[Any,Unit]]`
@@ -324,7 +324,7 @@ retrieved 129 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(akka.actor.ScalaActorRef, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
@@ -334,7 +334,7 @@ retrieved 129 members
 `method actorInstance=> java.util.concurrent.atomic.AtomicReference[akka.actor.Actor]`
 `method asInstanceOf[T0]=> T0`
 `method channel=> akka.actor.Channel[Any]`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method compareTo(other: akka.actor.ActorRef)Int`
 `method dispatcher=> akka.dispatch.MessageDispatcher`
 `method dispatcher_=(md: akka.dispatch.MessageDispatcher)Unit`
@@ -357,14 +357,14 @@ retrieved 129 members
 `method getHomeAddress()java.net.InetSocketAddress`
 `method getId()String`
 `method getLifeCycle()akka.config.Supervision.LifeCycle`
-`method getLinkedActors()java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method getLinkedActors()java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method getMailboxSize()Int`
 `method getReceiveTimeout()Option[Long]`
 `method getSender()Option[akka.actor.ActorRef]`
 `method getSenderFuture()Option[akka.dispatch.CompletableFuture[Any]]`
 `method getSupervisor()akka.actor.ActorRef`
 `method getTimeout()Long`
-`method getUuid()akka.actor.package.Uuid`
+`method getUuid()akka.actor.Uuid`
 `method handleTrapExit(dead: akka.actor.ActorRef, reason: Throwable)Unit`
 `method hashCode()Int`
 `method homeAddress=> Option[java.net.InetSocketAddress]`
@@ -378,7 +378,7 @@ retrieved 129 members
 `method isShutdown=> Boolean`
 `method isUnstarted=> Boolean`
 `method link(actorRef: akka.actor.ActorRef)Unit`
-`method linkedActors=> java.util.Map[akka.actor.package.Uuid,akka.actor.ActorRef]`
+`method linkedActors=> java.util.Map[akka.actor.Uuid,akka.actor.ActorRef]`
 `method mailbox=> AnyRef`
 `method mailboxSize=> Int`
 `method mailbox_=(value: AnyRef)AnyRef`
@@ -387,7 +387,7 @@ retrieved 129 members
 `method notifyAll()Unit`
 `method postMessageToMailbox(message: Any, senderOption: Option[akka.actor.ActorRef])Unit`
 `method postMessageToMailboxAndCreateFutureResultWithTimeout[T](message: Any, timeout: Long, senderOption: Option[akka.actor.ActorRef], senderFuture: Option[akka.dispatch.CompletableFuture[T]])akka.dispatch.CompletableFuture[T]`
-`method registerSupervisorAsRemoteActor=> Option[akka.actor.package.Uuid]`
+`method registerSupervisorAsRemoteActor=> Option[akka.actor.Uuid]`
 `method reply(message: Any)Unit`
 `method replySafe(message: AnyRef)Boolean`
 `method replyUnsafe(message: AnyRef)Unit`
@@ -424,10 +424,10 @@ retrieved 129 members
 `method supervisor=> Option[akka.actor.ActorRef]`
 `method supervisor_=(sup: Option[akka.actor.ActorRef])Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method unlink(actorRef: akka.actor.ActorRef)Unit`
-`method uuid=> akka.actor.package.Uuid`
-`method uuid_=(uid: akka.actor.package.Uuid)Unit`
+`method uuid=> akka.actor.Uuid`
+`method uuid_=(uid: akka.actor.Uuid)Unit`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -435,7 +435,7 @@ retrieved 129 members
 `value selfAny`
 `value xakka.actor.ScalaActorRef`
 `variable _statusakka.actor.ActorRefInternals.StatusType`
-`variable _uuidakka.actor.package.Uuid`
+`variable _uuidakka.actor.Uuid`
 `variable currentMessageakka.dispatch.MessageInvocation`
 `variable faultHandlerakka.config.Supervision.FaultHandlingStrategy`
 `variable hotswapscala.collection.immutable.Stack[PartialFunction[Any,Unit]]`
diff --git a/test/files/presentation/callcc-interpreter.check b/test/files/presentation/callcc-interpreter.check
index bb24edfb10..0a63f24a93 100644
--- a/test/files/presentation/callcc-interpreter.check
+++ b/test/files/presentation/callcc-interpreter.check
@@ -16,7 +16,7 @@ retrieved 62 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(callccInterpreter.type, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
@@ -24,7 +24,7 @@ retrieved 62 members
 `method apply(a: callccInterpreter.Value, b: callccInterpreter.Value)callccInterpreter.M[callccInterpreter.Value]`
 `method asInstanceOf[T0]=> T0`
 `method callCC[A](h: A => callccInterpreter.M[A] => callccInterpreter.M[A])callccInterpreter.M[A]`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)callccInterpreter.type`
 `method ensuring(cond: Boolean, msg: => Any)callccInterpreter.type`
 `method ensuring(cond: callccInterpreter.type => Boolean)callccInterpreter.type`
@@ -42,10 +42,10 @@ retrieved 62 members
 `method ne(x$1: AnyRef)Boolean`
 `method notify()Unit`
 `method notifyAll()Unit`
-`method showM(m: callccInterpreter.M[callccInterpreter.Value])java.lang.String`
+`method showM(m: callccInterpreter.M[callccInterpreter.Value])String`
 `method synchronized[T0](x$1: T0)T0`
 `method test(t: callccInterpreter.Term)String`
-`method toString()java.lang.String`
+`method toString()String`
 `method unitM[A](a: A)callccInterpreter.M[A]`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
@@ -79,7 +79,7 @@ def id[A >: Nothing <: Any]: A => A = ((x: A) => x)
 askType at CallccInterpreter.scala(17,25)
 ================================================================================
 [response] askTypeAt at (17,25)
-def showM(m: callccInterpreter.M[callccInterpreter.Value]): java.lang.String = m.in.apply(callccInterpreter.this.id[callccInterpreter.Value]).toString()
+def showM(m: callccInterpreter.M[callccInterpreter.Value]): String = m.in.apply(callccInterpreter.this.id[callccInterpreter.Value]).toString()
 ================================================================================
 
 askType at CallccInterpreter.scala(50,30)
diff --git a/test/files/presentation/ide-bug-1000475.check b/test/files/presentation/ide-bug-1000475.check
index 6f8fe66b9a..739d25c7c7 100644
--- a/test/files/presentation/ide-bug-1000475.check
+++ b/test/files/presentation/ide-bug-1000475.check
@@ -7,16 +7,16 @@ retrieved 34 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
-`method ->[B](y: B)(java.lang.Object, B)`
+`method +(other: String)String`
+`method ->[B](y: B)(Object, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
-`method ensuring(cond: Boolean)java.lang.Object`
-`method ensuring(cond: Boolean, msg: => Any)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean, msg: => Any)java.lang.Object`
+`method clone()Object`
+`method ensuring(cond: Boolean)Object`
+`method ensuring(cond: Boolean, msg: => Any)Object`
+`method ensuring(cond: Object => Boolean)Object`
+`method ensuring(cond: Object => Boolean, msg: => Any)Object`
 `method eq(x$1: AnyRef)Boolean`
 `method equals(x$1: Any)Boolean`
 `method finalize()Unit`
@@ -27,13 +27,13 @@ retrieved 34 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
-`method →[B](y: B)(java.lang.Object, B)`
+`method →[B](y: B)(Object, B)`
 `value selfAny`
-`value xjava.lang.Object`
+`value xObject`
 ================================================================================
 
 askTypeCompletion at Foo.scala(6,10)
@@ -43,16 +43,16 @@ retrieved 34 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
-`method ->[B](y: B)(java.lang.Object, B)`
+`method +(other: String)String`
+`method ->[B](y: B)(Object, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
-`method ensuring(cond: Boolean)java.lang.Object`
-`method ensuring(cond: Boolean, msg: => Any)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean, msg: => Any)java.lang.Object`
+`method clone()Object`
+`method ensuring(cond: Boolean)Object`
+`method ensuring(cond: Boolean, msg: => Any)Object`
+`method ensuring(cond: Object => Boolean)Object`
+`method ensuring(cond: Object => Boolean, msg: => Any)Object`
 `method eq(x$1: AnyRef)Boolean`
 `method equals(x$1: Any)Boolean`
 `method finalize()Unit`
@@ -63,13 +63,13 @@ retrieved 34 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
-`method →[B](y: B)(java.lang.Object, B)`
+`method →[B](y: B)(Object, B)`
 `value selfAny`
-`value xjava.lang.Object`
+`value xObject`
 ================================================================================
 
 askTypeCompletion at Foo.scala(7,7)
@@ -79,16 +79,16 @@ retrieved 34 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
-`method ->[B](y: B)(java.lang.Object, B)`
+`method +(other: String)String`
+`method ->[B](y: B)(Object, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
-`method ensuring(cond: Boolean)java.lang.Object`
-`method ensuring(cond: Boolean, msg: => Any)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean)java.lang.Object`
-`method ensuring(cond: java.lang.Object => Boolean, msg: => Any)java.lang.Object`
+`method clone()Object`
+`method ensuring(cond: Boolean)Object`
+`method ensuring(cond: Boolean, msg: => Any)Object`
+`method ensuring(cond: Object => Boolean)Object`
+`method ensuring(cond: Object => Boolean, msg: => Any)Object`
 `method eq(x$1: AnyRef)Boolean`
 `method equals(x$1: Any)Boolean`
 `method finalize()Unit`
@@ -99,11 +99,11 @@ retrieved 34 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
-`method →[B](y: B)(java.lang.Object, B)`
+`method →[B](y: B)(Object, B)`
 `value selfAny`
-`value xjava.lang.Object`
+`value xObject`
 ================================================================================
diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check
index 516d34b62b..67311cdf35 100644
--- a/test/files/presentation/ide-bug-1000531.check
+++ b/test/files/presentation/ide-bug-1000531.check
@@ -8,7 +8,7 @@ retrieved 121 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ++[B >: B](that: => scala.collection.GenTraversableOnce[B])Iterator[B]`
 `method ->[B](y: B)(java.util.Iterator[B], B)`
 `method /:[B](z: B)(op: (B, B) => B)B`
@@ -21,8 +21,8 @@ retrieved 121 members
 `method addString(b: StringBuilder, start: String, sep: String, end: String)StringBuilder`
 `method aggregate[B](z: B)(seqop: (B, B) => B, combop: (B, B) => B)B`
 `method asInstanceOf[T0]=> T0`
-`method buffered=> java.lang.Object with scala.collection.BufferedIterator[B]`
-`method clone()java.lang.Object`
+`method buffered=> Object with scala.collection.BufferedIterator[B]`
+`method clone()Object`
 `method collectFirst[B](pf: PartialFunction[B,B])Option[B]`
 `method collect[B](pf: PartialFunction[B,B])Iterator[B]`
 `method contains(elem: Any)Boolean`
@@ -75,9 +75,9 @@ retrieved 121 members
 `method nonEmpty=> Boolean`
 `method notify()Unit`
 `method notifyAll()Unit`
-`method padTo[A1 >: B](len: Int, elem: A1)java.lang.Object with Iterator[A1]`
+`method padTo[A1 >: B](len: Int, elem: A1)Object with Iterator[A1]`
 `method partition(p: B => Boolean)(Iterator[B], Iterator[B])`
-`method patch[B >: B](from: Int, patchElems: Iterator[B], replaced: Int)java.lang.Object with Iterator[B]`
+`method patch[B >: B](from: Int, patchElems: Iterator[B], replaced: Int)Object with Iterator[B]`
 `method product[B >: B](implicit num: Numeric[B])B`
 `method reduceLeftOption[B >: B](op: (B, B) => B)Option[B]`
 `method reduceLeft[B >: B](op: (B, B) => B)B`
@@ -109,15 +109,15 @@ retrieved 121 members
 `method toSeq=> Seq[B]`
 `method toSet[B >: B]=> scala.collection.immutable.Set[B]`
 `method toStream=> scala.collection.immutable.Stream[B]`
-`method toString()java.lang.String`
+`method toString()String`
 `method toTraversable=> Traversable[B]`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
 `method withFilter(p: B => Boolean)Iterator[B]`
-`method zipAll[B, A1 >: B, B1 >: B](that: Iterator[B], thisElem: A1, thatElem: B1)java.lang.Object with Iterator[(A1, B1)]`
-`method zipWithIndex=> java.lang.Object with Iterator[(B, Int)]{def idx: Int; def idx_=(x$1: Int): Unit}`
-`method zip[B](that: Iterator[B])java.lang.Object with Iterator[(B, B)]`
+`method zipAll[B, A1 >: B, B1 >: B](that: Iterator[B], thisElem: A1, thatElem: B1)Object with Iterator[(A1, B1)]`
+`method zipWithIndex=> Object with Iterator[(B, Int)]{def idx: Int; def idx_=(x$1: Int): Unit}`
+`method zip[B](that: Iterator[B])Object with Iterator[(B, B)]`
 `method →[B](y: B)(java.util.Iterator[B], B)`
 `value selfAny`
 `value xjava.util.Iterator[B]`
diff --git a/test/files/presentation/implicit-member.check b/test/files/presentation/implicit-member.check
index 021cc522ec..2f4e6bd828 100644
--- a/test/files/presentation/implicit-member.check
+++ b/test/files/presentation/implicit-member.check
@@ -8,13 +8,13 @@ retrieved 36 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(Implicit.type, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method AppliedImplicit[A](x: A)Implicit.AppliedImplicit[A]`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)Implicit.type`
 `method ensuring(cond: Boolean, msg: => Any)Implicit.type`
 `method ensuring(cond: Implicit.type => Boolean)Implicit.type`
@@ -29,7 +29,7 @@ retrieved 36 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
diff --git a/test/files/presentation/ping-pong.check b/test/files/presentation/ping-pong.check
index ed419f5a13..44e1a04732 100644
--- a/test/files/presentation/ping-pong.check
+++ b/test/files/presentation/ping-pong.check
@@ -7,12 +7,12 @@ retrieved 38 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(Pong, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)Pong`
 `method ensuring(cond: Boolean, msg: => Any)Pong`
 `method ensuring(cond: Pong => Boolean)Pong`
@@ -28,12 +28,12 @@ retrieved 38 members
 `method notifyAll()Unit`
 `method poke()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
 `method →[B](y: B)(Pong, B)`
-`value namejava.lang.String`
+`value nameString`
 `value pingPing`
 `value selfAny`
 `value xPong`
@@ -46,12 +46,12 @@ retrieved 38 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(Ping, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)Ping`
 `method ensuring(cond: Boolean, msg: => Any)Ping`
 `method ensuring(cond: Ping => Boolean)Ping`
@@ -63,13 +63,13 @@ retrieved 38 members
 `method hashCode()Int`
 `method isInstanceOf[T0]=> Boolean`
 `method loop=> Unit`
-`method name=> java.lang.String`
+`method name=> String`
 `method ne(x$1: AnyRef)Boolean`
 `method notify()Unit`
 `method notifyAll()Unit`
 `method poke=> Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -94,5 +94,5 @@ def poke: Unit = Ping.this.pong.poke()
 askType at PingPong.scala(17,10)
 ================================================================================
 [response] askTypeAt at (17,10)
-private[this] val name: java.lang.String = "pong"
+private[this] val name: String = "pong"
 ================================================================================
diff --git a/test/files/presentation/properties.check b/test/files/presentation/properties.check
index 5e7c6f64cc..268811c036 100644
--- a/test/files/presentation/properties.check
+++ b/test/files/presentation/properties.check
@@ -3,27 +3,28 @@ reload: properties.scala
 askTypeCompletion at properties.scala(29,33)
 ================================================================================
 [response] aksTypeCompletion at (29,33)
-retrieved 48 members
+retrieved 49 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
-`method ->[B](y: B)(properties.Property[java.lang.String], B)`
+`method +(other: String)String`
+`method ->[B](y: B)(properties.Property[String], B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
-`method apply()java.lang.String`
+`method _1=> String`
+`method apply()String`
 `method asInstanceOf[T0]=> T0`
 `method canEqual(that: Any)Boolean`
-`method clone()java.lang.Object`
-`method ensuring(cond: Boolean)properties.Property[java.lang.String]`
-`method ensuring(cond: Boolean, msg: => Any)properties.Property[java.lang.String]`
-`method ensuring(cond: properties.Property[java.lang.String] => Boolean)properties.Property[java.lang.String]`
-`method ensuring(cond: properties.Property[java.lang.String] => Boolean, msg: => Any)properties.Property[java.lang.String]`
+`method clone()Object`
+`method ensuring(cond: Boolean)properties.Property[String]`
+`method ensuring(cond: Boolean, msg: => Any)properties.Property[String]`
+`method ensuring(cond: properties.Property[String] => Boolean)properties.Property[String]`
+`method ensuring(cond: properties.Property[String] => Boolean, msg: => Any)properties.Property[String]`
 `method eq(x$1: AnyRef)Boolean`
 `method equals(x$1: Any)Boolean`
 `method finalize()Unit`
 `method formatted(fmtstr: String)String`
-`method get(newGetter: java.lang.String => java.lang.String)properties.Property[java.lang.String]`
+`method get(newGetter: String => String)properties.Property[String]`
 `method hashCode()Int`
 `method isInstanceOf[T0]=> Boolean`
 `method ne(x$1: AnyRef)Boolean`
@@ -32,47 +33,48 @@ retrieved 48 members
 `method productArity=> Int`
 `method productElement(n: Int)Any`
 `method productIterator=> Iterator[Any]`
-`method productPrefix=> java.lang.String`
-`method set(newSetter: java.lang.String => java.lang.String)properties.Property[java.lang.String]`
+`method productPrefix=> String`
+`method set(newSetter: String => String)properties.Property[String]`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
-`method update(newValue: java.lang.String)Unit`
+`method toString()String`
+`method update(newValue: String)Unit`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
-`method →[B](y: B)(properties.Property[java.lang.String], B)`
-`value initjava.lang.String`
+`method →[B](y: B)(properties.Property[String], B)`
+`value initString`
 `value selfAny`
-`value xproperties.Property[java.lang.String]`
-`variable getterjava.lang.String => java.lang.String`
-`variable setterjava.lang.String => java.lang.String`
-`variable valuejava.lang.String`
+`value xproperties.Property[String]`
+`variable getterString => String`
+`variable setterString => String`
+`variable valueString`
 ================================================================================
 
 askTypeCompletion at properties.scala(29,67)
 ================================================================================
 [response] aksTypeCompletion at (29,67)
-retrieved 48 members
+retrieved 49 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
-`method ->[B](y: B)(properties.Property[java.lang.String], B)`
+`method +(other: String)String`
+`method ->[B](y: B)(properties.Property[String], B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
-`method apply()java.lang.String`
+`method _1=> String`
+`method apply()String`
 `method asInstanceOf[T0]=> T0`
 `method canEqual(that: Any)Boolean`
-`method clone()java.lang.Object`
-`method ensuring(cond: Boolean)properties.Property[java.lang.String]`
-`method ensuring(cond: Boolean, msg: => Any)properties.Property[java.lang.String]`
-`method ensuring(cond: properties.Property[java.lang.String] => Boolean)properties.Property[java.lang.String]`
-`method ensuring(cond: properties.Property[java.lang.String] => Boolean, msg: => Any)properties.Property[java.lang.String]`
+`method clone()Object`
+`method ensuring(cond: Boolean)properties.Property[String]`
+`method ensuring(cond: Boolean, msg: => Any)properties.Property[String]`
+`method ensuring(cond: properties.Property[String] => Boolean)properties.Property[String]`
+`method ensuring(cond: properties.Property[String] => Boolean, msg: => Any)properties.Property[String]`
 `method eq(x$1: AnyRef)Boolean`
 `method equals(x$1: Any)Boolean`
 `method finalize()Unit`
 `method formatted(fmtstr: String)String`
-`method get(newGetter: java.lang.String => java.lang.String)properties.Property[java.lang.String]`
+`method get(newGetter: String => String)properties.Property[String]`
 `method hashCode()Int`
 `method isInstanceOf[T0]=> Boolean`
 `method ne(x$1: AnyRef)Boolean`
@@ -81,21 +83,21 @@ retrieved 48 members
 `method productArity=> Int`
 `method productElement(n: Int)Any`
 `method productIterator=> Iterator[Any]`
-`method productPrefix=> java.lang.String`
-`method set(newSetter: java.lang.String => java.lang.String)properties.Property[java.lang.String]`
+`method productPrefix=> String`
+`method set(newSetter: String => String)properties.Property[String]`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
-`method update(newValue: java.lang.String)Unit`
+`method toString()String`
+`method update(newValue: String)Unit`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
-`method →[B](y: B)(properties.Property[java.lang.String], B)`
-`value initjava.lang.String`
+`method →[B](y: B)(properties.Property[String], B)`
+`value initString`
 `value selfAny`
-`value xproperties.Property[java.lang.String]`
-`variable getterjava.lang.String => java.lang.String`
-`variable setterjava.lang.String => java.lang.String`
-`variable valuejava.lang.String`
+`value xproperties.Property[String]`
+`variable getterString => String`
+`variable setterString => String`
+`variable valueString`
 ================================================================================
 
 askTypeCompletion at properties.scala(45,10)
@@ -105,12 +107,12 @@ retrieved 36 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(properties.User, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)properties.User`
 `method ensuring(cond: Boolean, msg: => Any)properties.User`
 `method ensuring(cond: properties.User => Boolean)properties.User`
@@ -125,13 +127,13 @@ retrieved 36 members
 `method notify()Unit`
 `method notifyAll()Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
 `method →[B](y: B)(properties.User, B)`
-`value firstnameproperties.Property[java.lang.String]`
-`value lastnameproperties.Property[java.lang.String]`
+`value firstnameproperties.Property[String]`
+`value lastnameproperties.Property[String]`
 `value selfAny`
 `value xproperties.User`
 ================================================================================
diff --git a/test/files/presentation/random.check b/test/files/presentation/random.check
index 96d3aba5d0..fce4b69fb3 100644
--- a/test/files/presentation/random.check
+++ b/test/files/presentation/random.check
@@ -24,4 +24,4 @@ askType at Random.scala(26,12)
 ================================================================================
 [response] askTypeAt at (26,12)
 _
-================================================================================
\ No newline at end of file
+================================================================================
diff --git a/test/files/presentation/timeofday.check b/test/files/presentation/timeofday.check
index da93527b89..1067e0a8fa 100644
--- a/test/files/presentation/timeofday.check
+++ b/test/files/presentation/timeofday.check
@@ -7,12 +7,12 @@ retrieved 43 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(timeofday.TimeOfDayVar, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)timeofday.TimeOfDayVar`
 `method ensuring(cond: Boolean, msg: => Any)timeofday.TimeOfDayVar`
 `method ensuring(cond: timeofday.TimeOfDayVar => Boolean)timeofday.TimeOfDayVar`
@@ -33,7 +33,7 @@ retrieved 43 members
 `method seconds=> Int`
 `method seconds_=(s: Int)Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`
@@ -52,12 +52,12 @@ retrieved 43 members
 `method !=(x$1: Any)Boolean`
 `method !=(x$1: AnyRef)Boolean`
 `method ##()Int`
-`method +(other: String)java.lang.String`
+`method +(other: String)String`
 `method ->[B](y: B)(timeofday.TimeOfDayVar, B)`
 `method ==(x$1: Any)Boolean`
 `method ==(x$1: AnyRef)Boolean`
 `method asInstanceOf[T0]=> T0`
-`method clone()java.lang.Object`
+`method clone()Object`
 `method ensuring(cond: Boolean)timeofday.TimeOfDayVar`
 `method ensuring(cond: Boolean, msg: => Any)timeofday.TimeOfDayVar`
 `method ensuring(cond: timeofday.TimeOfDayVar => Boolean)timeofday.TimeOfDayVar`
@@ -78,7 +78,7 @@ retrieved 43 members
 `method seconds=> Int`
 `method seconds_=(s: Int)Unit`
 `method synchronized[T0](x$1: T0)T0`
-`method toString()java.lang.String`
+`method toString()String`
 `method wait()Unit`
 `method wait(x$1: Long)Unit`
 `method wait(x$1: Long, x$2: Int)Unit`