Merge pull request #331 from dotty-staging/fix/refined-subtyping

Fix/refined subtyping

1 files changed, 9 insertions, 6 deletions

diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala
index 166c2a7c4..f34135431 100644
--- a/src/dotty/tools/dotc/printing/PlainPrinter.scala
+++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala
@@ -145,10 +145,10 @@ class PlainPrinter(_ctx: Context) extends Printer {
         if (tp.isInstantiated)
           toTextLocal(tp.instanceOpt) ~ "'" // debug for now, so that we can see where the TypeVars are.
         else {
-          val bounds = ctx.typerState.constraint.at(tp.origin) match {
-            case bounds: TypeBounds => bounds
-            case _ => TypeBounds.empty
-          }
+          val constr = ctx.typerState.constraint
+          val bounds = 
+            if (constr.contains(tp)) constr.fullBounds(tp.origin) 
+            else TypeBounds.empty 
           "(" ~ toText(tp.origin) ~ "?" ~ toText(bounds) ~ ")"
         }
       case _ =>
@@ -207,8 +207,11 @@ class PlainPrinter(_ctx: Context) extends Printer {
         toText(value)
       case MethodParam(mt, idx) =>
         nameString(mt.paramNames(idx))
-      case RefinedThis(_) =>
-        "this"
+      case sk: SkolemType =>
+        sk.binder match {
+          case rt: RefinedType => s"${nameString(rt.typeSymbol)}{...}.this"
+          case _ => "<skolem>"
+        }
     }
   }