diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-28 21:46:53 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-29 15:43:09 +0200 |
| commit | d28879042951015f0ef2d5263b7df264a13a8055 (patch) | |
| tree | 83b798dd9575581c21040c8774f9bcf262675505 /src | |
| parent | ec05aeb3d6e414d2abf8354849eeaa7cc75ee477 (diff) | |
| download | scala-d28879042951015f0ef2d5263b7df264a13a8055.tar.gz scala-d28879042951015f0ef2d5263b7df264a13a8055.tar.bz2 scala-d28879042951015f0ef2d5263b7df264a13a8055.zip | |
SI-8596 Fix rangepos crasher with defaults, poly methods
Regressed in SI-7915 / 3009a525b5
We should be deriving the position of the synthetic `Select`
from `basefun1`, rather than `basefun`. In the new, enclosed
test, the difference amounts to:
new Container().typeParamAndDefaultArg[Any]()
`------------ basefun1 --------------'
`----------------- basefun ---------------'
For monomorphic methods, these are one and the same, which is
why `presentation/t7915` was working. I've extended that test
to a polymorphic method to check that hyperlink resolution works.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala index 70f2f41ec7..307e17d97a 100644 --- a/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala +++ b/src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala @@ -175,9 +175,9 @@ trait NamesDefaults { self: Analyzer => // setSymbol below is important because the 'selected' function might be overloaded. by // assigning the correct method symbol, typedSelect will just assign the type. the reason // to still call 'typed' is to correctly infer singleton types, SI-5259. - val selectPos = - if(qual.pos.isRange && baseFun.pos.isRange) qual.pos.union(baseFun.pos).withStart(Math.min(qual.pos.end, baseFun.pos.end)) - else baseFun.pos + val selectPos = + if(qual.pos.isRange && baseFun1.pos.isRange) qual.pos.union(baseFun1.pos).withStart(Math.min(qual.pos.end, baseFun1.pos.end)) + else baseFun1.pos val f = blockTyper.typedOperator(Select(newQual, selected).setSymbol(baseFun1.symbol).setPos(selectPos)) if (funTargs.isEmpty) f else TypeApply(f, funTargs).setType(baseFun.tpe) |