Merge pull request #8580 from dotty-staging/fix-#8573

Fix #8573: Fix higher-kinded bounded opaque types

Author: odersky

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -432,11 +432,13 @@ object SymDenotations {
      *  self type of the enclosing class.
      *  Otherwise return `info`
      *
-     *  @param info   Is assumed to be a (lambda-abstracted) right hand side TypeAlias
-     *                of the opaque type definition.
-     *  @param rhs    The right hand side tree of the type definition
+     *  @param info    Is assumed to be a (lambda-abstracted) right hand side TypeAlias
+     *                 of the opaque type definition.
+     *  @param rhs     The right hand side tree of the type definition
+     *  @param tparams The type parameters with which the right-hand side bounds should be abstracted
+     *
      */
-    def opaqueToBounds(info: Type, rhs: tpd.Tree)(using Context): Type =
+    def opaqueToBounds(info: Type, rhs: tpd.Tree, tparams: List[TypeParamInfo])(using Context): Type =
 
       def setAlias(tp: Type) =
         def recur(self: Type): Unit = self match
@@ -449,7 +451,7 @@ object SymDenotations {
       end setAlias
 
       def bounds(t: tpd.Tree): TypeBounds = t match
-        case LambdaTypeTree(_, body) =>
+        case LambdaTypeTree(tparams, body) =>
           bounds(body)
         case TypeBoundsTree(lo, hi, alias) =>
           assert(!alias.isEmpty)
@@ -460,7 +462,7 @@ object SymDenotations {
       info match
         case TypeAlias(alias) if isOpaqueAlias && owner.isClass =>
           setAlias(alias)
-          HKTypeLambda.boundsFromParams(alias.typeParams, bounds(rhs))
+          HKTypeLambda.boundsFromParams(tparams, bounds(rhs))
         case _ =>
           info
     end opaqueToBounds

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -839,7 +839,7 @@ class TreeUnpickler(reader: TastyReader,
                 case _: TypeBounds | _: ClassInfo => checkNonCyclic(sym, rhs.tpe, reportErrors = false)
                 case _ => rhs.tpe.toBounds
               },
-              rhs)
+              rhs, rhs.tpe.typeParams)
             if sym.isOpaqueAlias then sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
             sym.resetFlag(Provisional)
             TypeDef(rhs)

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -997,10 +997,16 @@ class Namer { typer: Typer =>
       val rhs1 = typedAheadType(rhs)
       val rhsBodyType: TypeBounds = rhs1.tpe.toBounds
       val unsafeInfo = if (isDerived) rhsBodyType else abstracted(rhsBodyType)
+
+      def opaqueToBounds(info: Type): Type =
+        if sym.isOpaqueAlias && tparamSyms.isEmpty && info.typeParams.nonEmpty then
+          ctx.error(em"opaque type alias must be fully applied", rhs.sourcePos)
+        sym.opaqueToBounds(info, rhs1, tparamSyms)
+
       if (isDerived) sym.info = unsafeInfo
       else {
         sym.info = NoCompleter
-        sym.info = sym.opaqueToBounds(checkNonCyclic(sym, unsafeInfo, reportErrors = true), rhs1)
+        sym.info = opaqueToBounds(checkNonCyclic(sym, unsafeInfo, reportErrors = true))
       }
       if sym.isOpaqueAlias then sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
       sym.resetFlag(Provisional)

tests/neg/i6225.scala

@@ -1,12 +1,12 @@
-object O1 {
+object O1 {  // error: cannot be instantiated
   type A[X] = X
-  opaque type T = A
+  opaque type T = A // error: opaque type alias must be fully applied
 }
 
 object O2 {
   opaque type A[X] = X
-  object A {
-    opaque type T = A
+  object A { // error: cannot be instantiated
+    opaque type T = A  // error: opaque type alias must be fully applied
   }
 }
 

tests/pos/i8537.scala

@@ -0,0 +1,3 @@
+val f: Int => String = _ => "b"
+var g: Int => String = (_) => "b"  // workaround
+var h: Int => String = _ => "b"    // end of statement expected but '=>' found

tests/pos/i8573.scala

@@ -0,0 +1,7 @@
+object Example1 {
+  opaque type Foo[A] <: A = A
+}
+
+object Example2 {
+  opaque type Foo[A] >: A = A
+}