diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 12:13:40 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 12:13:40 +0000 |
| commit | 583aacd3fcc35449f1997e4399970ad23bbe6d9c (patch) | |
| tree | 5c6df61e197141adc1479f17acb945f3d56c574c /src | |
| parent | c51f9f392fa1603e4d2b692bdcca9ffac3710539 (diff) | |
| download | scala-583aacd3fcc35449f1997e4399970ad23bbe6d9c.tar.gz scala-583aacd3fcc35449f1997e4399970ad23bbe6d9c.tar.bz2 scala-583aacd3fcc35449f1997e4399970ad23bbe6d9c.zip | |
Merged revisions 22620,22832 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22620 | plocinic | 2010-07-22 12:45:42 +0200 (Thu, 22 Jul 2010) | 1 line
Allow for overriding the debugIDE val (requested for ENSIME). No
review. ........ r22832 | plocinic | 2010-08-24 11:27:12 +0200 (Tue, 24
Aug 2010) | 1 line
Correctly locate context tree even on the edges. Fixed buggy
definition of properlyPrecedes. Fix necessary for the eclipse plugin
(ticket 1000124) as well as ENSIME. Review by milessabin. ........
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/ContextTrees.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/Position.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala index af4052a2e2..8fa4b86219 100644 --- a/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala +++ b/src/compiler/scala/tools/nsc/interactive/ContextTrees.scala @@ -46,7 +46,7 @@ trait ContextTrees { self: Global => if (contexts.isEmpty) None else { val hi = contexts.length - 1 - if ((contexts(hi).pos precedes pos) || (pos precedes contexts(0).pos)) None + if ((contexts(hi).pos properlyPrecedes pos) || (pos properlyPrecedes contexts(0).pos)) None else { def loop(lo: Int, hi: Int): Option[ContextTree] = { val mid = (lo + hi) / 2 diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 94322178b1..bf901b321a 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -24,7 +24,7 @@ self => import definitions._ - final val debugIDE = false + val debugIDE = false override def onlyPresentation = true diff --git a/src/compiler/scala/tools/nsc/util/Position.scala b/src/compiler/scala/tools/nsc/util/Position.scala index 8d0ff37c44..31202eec8f 100644 --- a/src/compiler/scala/tools/nsc/util/Position.scala +++ b/src/compiler/scala/tools/nsc/util/Position.scala @@ -154,7 +154,7 @@ trait Position { * do not share a common point). */ def properlyPrecedes(pos: Position) = - isDefined && pos.isDefined && startOrPoint < pos.endOrPoint + isDefined && pos.isDefined && endOrPoint < pos.startOrPoint /** Does this position overlap with that position? * This holds if both positions are ranges and there is an interval of |