diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala | 2 | ||||
| -rw-r--r-- | test/files/presentation/akka.check | 26 | ||||
| -rw-r--r-- | test/files/presentation/akka/src/pi.scala | 4 |
3 files changed, 18 insertions, 14 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala index c53247c054..0ca52dcba7 100644 --- a/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala +++ b/src/compiler/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala @@ -79,7 +79,7 @@ private[tests] trait CoreTestDefs reporter.println("\nNo symbol is associated with tree: "+tree) } else { - reporter.println("\naskHyperlinkPos for `" + tree.symbol.name + "` at " + format(pos) + " " + tree.symbol.sourceFile.name) + reporter.println("\naskHyperlinkPos for `" + tree.symbol.name + "` at " + format(pos) + " " + pos.source.file.name) val r = new Response[Position] val sourceFile = sourceFiles.find(tree.symbol.sourceFile.path == _.path) match { case Some(source) => diff --git a/test/files/presentation/akka.check b/test/files/presentation/akka.check index d24d3d5711..27e6ab7248 100644 --- a/test/files/presentation/akka.check +++ b/test/files/presentation/akka.check @@ -10,7 +10,7 @@ retrieved 0 members askTypeCompletion at pi.scala(55,25) ================================================================================ [response] aksTypeCompletion at (55,25) -retrieved 43 members +retrieved 44 members `class Broadcastakka.routing.Routing.Broadcast` `method !=(x$1: Any)Boolean` `method !=(x$1: AnyRef)Boolean` @@ -48,14 +48,15 @@ retrieved 43 members `method →[B](y: B)(akka.routing.Routing.type, B)` `trait RoutingMessageakka.routing.Routing.RoutingMessage` `type PFakka.routing.Routing.PF` +`value __leftOfArrowakka.routing.Routing.type` +`value __resultOfEnsuringakka.routing.Routing.type` `value selfAny` -`value xakka.routing.Routing.type` ================================================================================ askTypeCompletion at pi.scala(55,73) ================================================================================ [response] aksTypeCompletion at (55,73) -retrieved 129 members +retrieved 130 members `method !!(implicit sender: Option[akka.actor.ActorRef])akka.dispatch.Future[T]` `method !!(message: Any, timeout: Long)(implicit sender: Option[akka.actor.ActorRef])Option[Any]` `method !(message: Any)(implicit sender: Option[akka.actor.ActorRef])Unit` @@ -170,8 +171,9 @@ retrieved 129 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(akka.actor.ActorRef, B)` +`value __leftOfArrowakka.actor.ActorRef` +`value __resultOfEnsuringakka.actor.ActorRef` `value selfAny` -`value xakka.actor.ActorRef` `variable _statusakka.actor.ActorRefInternals.StatusType` `variable _uuidakka.actor.Uuid` `variable currentMessageakka.dispatch.MessageInvocation` @@ -186,7 +188,7 @@ retrieved 129 members askTypeCompletion at pi.scala(65,15) ================================================================================ [response] aksTypeCompletion at (65,15) -retrieved 129 members +retrieved 130 members `method !!(implicit sender: Option[akka.actor.ActorRef])akka.dispatch.Future[T]` `method !!(message: Any, timeout: Long)(implicit sender: Option[akka.actor.ActorRef])Option[Any]` `method !(message: Any)(implicit sender: Option[akka.actor.ActorRef])Unit` @@ -301,8 +303,9 @@ retrieved 129 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(akka.actor.ActorRef, B)` +`value __leftOfArrowakka.actor.ActorRef` +`value __resultOfEnsuringakka.actor.ActorRef` `value selfAny` -`value xakka.actor.ActorRef` `variable _statusakka.actor.ActorRefInternals.StatusType` `variable _uuidakka.actor.Uuid` `variable currentMessageakka.dispatch.MessageInvocation` @@ -317,7 +320,7 @@ retrieved 129 members askTypeCompletion at pi.scala(74,46) ================================================================================ [response] aksTypeCompletion at (74,46) -retrieved 129 members +retrieved 130 members `method !!(implicit sender: Option[akka.actor.ActorRef])akka.dispatch.Future[T]` `method !!(message: Any, timeout: Long)(implicit sender: Option[akka.actor.ActorRef])Option[Any]` `method !(message: Any)(implicit sender: Option[akka.actor.ActorRef])Unit` @@ -432,8 +435,9 @@ retrieved 129 members `method wait(x$1: Long)Unit` `method wait(x$1: Long, x$2: Int)Unit` `method →[B](y: B)(akka.actor.ScalaActorRef, B)` +`value __leftOfArrowakka.actor.ScalaActorRef` +`value __resultOfEnsuringakka.actor.ScalaActorRef` `value selfAny` -`value xakka.actor.ScalaActorRef` `variable _statusakka.actor.ActorRefInternals.StatusType` `variable _uuidakka.actor.Uuid` `variable currentMessageakka.dispatch.MessageInvocation` @@ -470,12 +474,12 @@ askHyperlinkPos for `Actor` at (24,28) pi.scala askHyperlinkPos for `reply` at (36,18) pi.scala ================================================================================ -[response] found askHyperlinkPos for `reply` at (1382,7) ActorRef.scala +[response] found askHyperlinkPos for `reply` at <no position> ActorRef.scala ================================================================================ -askHyperlinkPos for `nrOfResults_$eq` at (73,19) pi.scala +askHyperlinkPos for `nrOfResults` at (73,19) pi.scala ================================================================================ -[response] found askHyperlinkPos for `nrOfResults_$eq` at (48,9) pi.scala +[response] found askHyperlinkPos for `nrOfResults` at (48,9) pi.scala ================================================================================ askHyperlinkPos for `latch` at (86,11) pi.scala diff --git a/test/files/presentation/akka/src/pi.scala b/test/files/presentation/akka/src/pi.scala index f86876ca61..24eba5a013 100644 --- a/test/files/presentation/akka/src/pi.scala +++ b/test/files/presentation/akka/src/pi.scala @@ -33,7 +33,7 @@ object Pi extends App { def receive /*?*/ = { case Work(start, nrOfElements) => - self reply/*#*/ Result(calculatePiFor(start, nrOfElements)) // perform the work + self reply/*#*/ Result(calculatePiFor(start, nrOfElements)) // perform the work // TODO: this currently returns wrong position for the symbol } } @@ -105,4 +105,4 @@ object Pi extends App { // wait for master to shut down latch.await() } -}
\ No newline at end of file +} |