diff options
author | Paul Phillips <paulp@improving.org> | 2013-09-27 14:38:38 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-09-27 14:42:24 -0700 |
commit | 7d62df035cd4393c73e7530e1cad1130e79d90c6 (patch) | |
tree | 8a643ea65861b7bceb8d22397d991401b8716079 /src/interactive | |
parent | 5a8cd09819f58adcb866722f48b00066d23e7a82 (diff) | |
download | scala-7d62df035cd4393c73e7530e1cad1130e79d90c6.tar.gz scala-7d62df035cd4393c73e7530e1cad1130e79d90c6.tar.bz2 scala-7d62df035cd4393c73e7530e1cad1130e79d90c6.zip |
Updating Position call sites.
Calling position factories rather than instantiating these
particular classes. Not calling deprecated methods. Added a few
position combinator methods.
Diffstat (limited to 'src/interactive')
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/Picklers.scala | 20 | ||||
-rw-r--r-- | src/interactive/scala/tools/nsc/interactive/tests/Tester.scala | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Picklers.scala b/src/interactive/scala/tools/nsc/interactive/Picklers.scala index e75b4a3cc6..30d3048aa0 100644 --- a/src/interactive/scala/tools/nsc/interactive/Picklers.scala +++ b/src/interactive/scala/tools/nsc/interactive/Picklers.scala @@ -9,7 +9,7 @@ import util.InterruptReq import scala.reflect.internal.util.{ SourceFile, BatchSourceFile } import io.{ AbstractFile, PlainFile } import util.EmptyAction -import scala.reflect.internal.util.{ RangePosition, OffsetPosition, TransparentPosition } +import scala.reflect.internal.util.Position import Pickler._ import scala.collection.mutable import mutable.ListBuffer @@ -65,20 +65,20 @@ trait Picklers { self: Global => f => f.file ~ delta(f.file, f.content) }.asClass (classOf[BatchSourceFile]) - lazy val offsetPosition: CondPickler[OffsetPosition] = + lazy val offsetPosition: CondPickler[Position] = (pkl[SourceFile] ~ pkl[Int]) - .wrapped { case x ~ y => new OffsetPosition(x, y) } { p => p.source ~ p.point } - .asClass (classOf[OffsetPosition]) + .wrapped { case x ~ y => Position.offset(x, y) } { p => p.source ~ p.point } + .asClass (classOf[Position]) - lazy val rangePosition: CondPickler[RangePosition] = + lazy val rangePosition: CondPickler[Position] = (pkl[SourceFile] ~ pkl[Int] ~ pkl[Int] ~ pkl[Int]) - .wrapped { case source ~ start ~ point ~ end => new RangePosition(source, start, point, end) } { p => p.source ~ p.start ~ p.point ~ p.end } - .asClass (classOf[RangePosition]) + .wrapped { case source ~ start ~ point ~ end => Position.range(source, start, point, end) } { p => p.source ~ p.start ~ p.point ~ p.end } + .asClass (classOf[Position]) - lazy val transparentPosition: CondPickler[TransparentPosition] = + lazy val transparentPosition: CondPickler[Position] = (pkl[SourceFile] ~ pkl[Int] ~ pkl[Int] ~ pkl[Int]) - .wrapped { case source ~ start ~ point ~ end => new TransparentPosition(source, start, point, end) } { p => p.source ~ p.start ~ p.point ~ p.end } - .asClass (classOf[TransparentPosition]) + .wrapped { case source ~ start ~ point ~ end => Position.range(source, start, point, end).makeTransparent } { p => p.source ~ p.start ~ p.point ~ p.end } + .asClass (classOf[Position]) lazy val noPosition = singletonPickler(NoPosition) diff --git a/src/interactive/scala/tools/nsc/interactive/tests/Tester.scala b/src/interactive/scala/tools/nsc/interactive/tests/Tester.scala index 4390d5dc54..f1ada32808 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/Tester.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/Tester.scala @@ -131,7 +131,7 @@ class Tester(ntests: Int, inputs: Array[SourceFile], settings: Settings) { } def otherTest() { if (testPositions.nonEmpty) { - val pos = new OffsetPosition(inputs(sfidx), rand.nextInt(testPositions.length)) + val pos = Position.offset(inputs(sfidx), rand.nextInt(testPositions.length)) rand.nextInt(3) match { case 0 => askTypeAt(pos) case 1 => askTypeCompletion(pos) |