From 379e113e568c3d3193aace81fc37d7279eff4f8c Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Tue, 4 Apr 2017 17:30:00 -0700 Subject: `CompleterWrapper` delegates `typeParams`. Fixes the problem reported with #5730 by xuwei-k in scala/scala-dev#352. The problem was already present before the introduction of `applyUnapplyMethodCompleter`, as 63f7b35 (in #5294) introduced a similar bug where the `PolyTypeCompleter`'s `typeParams` override was masked. --- src/compiler/scala/tools/nsc/typechecker/Namers.scala | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 51df750951..1e4a59615f 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -614,6 +614,9 @@ trait Namers extends MethodSynthesis { } class CompleterWrapper(completer: TypeCompleter) extends TypeCompleter { + // override important when completer.isInstanceOf[PolyTypeCompleter]! + override val typeParams = completer.typeParams + val tree = completer.tree override def complete(sym: Symbol): Unit = { -- cgit v1.2.3