Use tpd.desugarIdentPrefix

nicolasstucki · nicolasstucki · commit d95f8d48e354 · 2018-05-07T11:24:30.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
@@ -40,8 +40,7 @@ class InterceptedMethods extends MiniPhase {
 
   override def transformIdent(tree: tpd.Ident)(implicit ctx: Context): Tree = {
     if (tree.symbol.isTerm && (defn.Any_## eq tree.symbol.asTerm)) {
-      val cls = ctx.owner.ownersIterator.find(_.isClass).get.asClass
-      val rewrite = poundPoundValue(This(cls))
+      val rewrite = poundPoundValue(tpd.desugarIdentPrefix(tree))
       ctx.log(s"$phaseName rewrote $tree to $rewrite")
       rewrite
     }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ class InterceptedMethods extends MiniPhase {`
`40`	`40`
`41`	`41`	`override def transformIdent(tree: tpd.Ident)(implicit ctx: Context): Tree = {`
`42`	`42`	`if (tree.symbol.isTerm && (defn.Any_## eq tree.symbol.asTerm)) {`
`43`		`- val cls = ctx.owner.ownersIterator.find(_.isClass).get.asClass`
`44`		`- val rewrite = poundPoundValue(This(cls))`
	`43`	`+ val rewrite = poundPoundValue(tpd.desugarIdentPrefix(tree))`
`45`	`44`	`ctx.log(s"$phaseName rewrote $tree to $rewrite")`
`46`	`45`	`rewrite`
`47`	`46`	`}`