Merge pull request #9090 from dotty-staging/disallow-unapplied

nicolasstucki · web-flow · commit cc8d6c3e1988 · 2020-06-03T16:59:28.000+02:00
Disallow unapplied types in aliases and bounds
diff --git a/community-build/community-projects/dotty-cps-async b/community-build/community-projects/dotty-cps-async
@@ -1 +1 @@
-Subproject commit f7c9ecddead60c9b9e3b10d29ef54ea2117106a1
+Subproject commit dd541bb26161b3532f5904e770fa256986f7b3e6
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
@@ -1 +1 @@
-Subproject commit 2e65410017fcec938ccf522ada2f347b783ea012
+Subproject commit 6eaf81d92743d24b5cf2fbae0ec2d59ef1e11414
diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala
@@ -243,15 +243,15 @@ object Trees {
   // ------ Categories of trees -----------------------------------
 
   /** Instances of this class are trees for which isType is definitely true.
-   *  Note that some trees have isType = true without being TypTrees (e.g. Ident, AnnotatedTree)
+   *  Note that some trees have isType = true without being TypTrees (e.g. Ident, Annotated)
    */
   trait TypTree[-T >: Untyped] extends Tree[T] {
     type ThisTree[-T >: Untyped] <: TypTree[T]
     override def isType: Boolean = true
   }
 
   /** Instances of this class are trees for which isTerm is definitely true.
-   *  Note that some trees have isTerm = true without being TermTrees (e.g. Ident, AnnotatedTree)
+   *  Note that some trees have isTerm = true without being TermTrees (e.g. Ident, Annotated)
    */
   trait TermTree[-T >: Untyped] extends Tree[T] {
     type ThisTree[-T >: Untyped] <: TermTree[T]
diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala
@@ -1086,6 +1086,22 @@ trait Checking {
     checker.traverse(tree)
   }
 
+  /** Check that user-defined (result) type is fully applied */
+  def checkFullyAppliedType(tree: Tree)(using Context): Unit = tree match
+    case TypeBoundsTree(lo, hi, alias) =>
+      checkFullyAppliedType(lo)
+      checkFullyAppliedType(hi)
+      checkFullyAppliedType(alias)
+    case Annotated(arg, annot) =>
+      checkFullyAppliedType(arg)
+    case LambdaTypeTree(_, body) =>
+      checkFullyAppliedType(body)
+    case _: TypeTree =>
+    case _ =>
+      if tree.tpe.typeParams.nonEmpty then
+        val what = if tree.symbol.exists then tree.symbol else i"type $tree"
+        ctx.error(em"$what takes type parameters", tree.sourcePos)
+
   /** Check that we are in an inline context (inside an inline method or in inline code) */
   def checkInInlineContext(what: String, posd: Positioned)(using Context): Unit =
     if !Inliner.inInlineMethod && !ctx.isInlineContext then
@@ -1209,6 +1225,7 @@ trait ReChecking extends Checking {
   import tpd._
   override def checkEnum(cdef: untpd.TypeDef, cls: Symbol, firstParent: Symbol)(using Context): Unit = ()
   override def checkRefsLegal(tree: tpd.Tree, badOwner: Symbol, allowed: (Name, Symbol) => Boolean, where: String)(using Context): Unit = ()
+  override def checkFullyAppliedType(tree: Tree)(using Context): Unit = ()
   override def checkEnumCaseRefsLegal(cdef: TypeDef, enumCtx: Context)(using Context): Unit = ()
   override def checkAnnotApplicable(annot: Tree, sym: Symbol)(using Context): Boolean = true
 }
diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala
@@ -277,9 +277,14 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context):
           val elemLabels = accessors.map(acc => ConstantType(Constant(acc.name.toString)))
           val (monoType, elemsType) = mirroredType match
             case mirroredType: HKTypeLambda =>
+              def accessorType(acc: Symbol) =
+                if cls.typeParams.hasSameLengthAs(mirroredType.paramRefs) then
+                  acc.info.subst(cls.typeParams, mirroredType.paramRefs)
+                else
+                  acc.info
               val elems =
                 mirroredType.derivedLambdaType(
-                  resType = TypeOps.nestedPairs(accessors.map(mirroredType.memberInfo(_).widenExpr))
+                  resType = TypeOps.nestedPairs(accessors.map(accessorType))
                 )
               (mkMirroredMonoType(mirroredType), elems)
             case _ =>
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -1684,13 +1684,16 @@ class Typer extends Namer
     }
   }
 
-  def typedLambdaTypeTree(tree: untpd.LambdaTypeTree)(using Context): Tree = {
+  private def typeIndexedLambdaTypeTree(
+      tree: untpd.LambdaTypeTree, tparams: List[untpd.TypeDef], body: untpd.Tree)(using Context) =
+    val tparams1 = tparams.map(typed(_)).asInstanceOf[List[TypeDef]]
+    val body1 = typedType(body)
+    assignType(cpy.LambdaTypeTree(tree)(tparams1, body1), tparams1, body1)
+
+  def typedLambdaTypeTree(tree: untpd.LambdaTypeTree)(using Context): Tree =
     val LambdaTypeTree(tparams, body) = tree
     index(tparams)
-    val tparams1 = tparams.mapconserve(typed(_).asInstanceOf[TypeDef])
-    val body1 = typedType(tree.body)
-    assignType(cpy.LambdaTypeTree(tree)(tparams1, body1), tparams1, body1)
-  }
+    typeIndexedLambdaTypeTree(tree, tparams, body)
 
   def typedTermLambdaTypeTree(tree: untpd.TermLambdaTypeTree)(using Context): Tree =
     if dependentEnabled then
@@ -1943,14 +1946,12 @@ class Typer extends Namer
   def typedTypeDef(tdef: untpd.TypeDef, sym: Symbol)(using Context): Tree = {
     val TypeDef(name, rhs) = tdef
     completeAnnotations(tdef, sym)
-    val rhs1 = tdef.rhs match {
+    val rhs1 = tdef.rhs match
       case rhs @ LambdaTypeTree(tparams, body) =>
-        val tparams1 = tparams.map(typed(_)).asInstanceOf[List[TypeDef]]
-        val body1 = typedType(body)
-        assignType(cpy.LambdaTypeTree(rhs)(tparams1, body1), tparams1, body1)
+        typeIndexedLambdaTypeTree(rhs, tparams, body)
       case rhs =>
         typedType(rhs)
-    }
+    checkFullyAppliedType(rhs1)
     assignType(cpy.TypeDef(tdef)(name, rhs1), sym)
   }
 
diff --git a/tests/neg/i4557.scala b/tests/neg/i4557.scala
@@ -2,11 +2,11 @@ class C0[A]
 class C1[A, B]
 
 object O {
-  type T0 = C0
+  type T0[X] = C0[X]
   type T1 = C0[String, Int] // error
   type T2[A] = C0[A, Int] // error
 
-  type S0 = C1
+  type S0[X, Y] = C1[X, Y]
   type S1 = C1[Int] // error
 
   class D0 extends T0 // error
diff --git a/tests/neg/i7820.scala b/tests/neg/i7820.scala
@@ -1,3 +1,3 @@
 trait A1 { type F[X <: F[_, _], Y] }  // error: cyclic reference involving type F
-trait A2 { type F[X <: F, Y] }        // error: cyclic reference involving type F
-trait A3 { type F[X >: F, Y] }        // error: cyclic reference involving type F
+trait A2 { type F[X <: F, Y] }        // error: cyclic reference involving type F // error
+trait A3 { type F[X >: F, Y] }        // error: cyclic reference involving type F // error
diff --git a/tests/neg/multi-param-derives.scala b/tests/neg/multi-param-derives.scala
@@ -27,7 +27,7 @@ object Test extends App {
       given t2 [T] as Functor[[U] =>> (T, U)] {}
       given t3 [T, U] as Functor[[V] =>> (T, U, V)] {}
 
-      def derived[F[_]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}
+      def derived[F[_]](using m: Mirror { type MirroredType[X] = F[X] ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}
     }
 
     case class Mono(i: Int) derives Functor
@@ -43,7 +43,7 @@ object Test extends App {
       given [C] as FunctorK[[F[_]] =>> C] {}
       given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]
 
-      def derived[F[_[_]]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
+      def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
     }
 
     case class Mono(i: Int) derives FunctorK
@@ -61,7 +61,7 @@ object Test extends App {
       given t2 as Bifunctor[[T, U] =>> (T, U)] {}
       given t3 [T] as Bifunctor[[U, V] =>> (T, U, V)] {}
 
-      def derived[F[_, _]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???
+      def derived[F[_, _]](using m: Mirror { type MirroredType[X, Y] = F[X, Y] ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???
     }
 
     case class Mono(i: Int) derives Bifunctor
diff --git a/tests/neg/parser-stability-12.scala b/tests/neg/parser-stability-12.scala
@@ -1,4 +1,4 @@
 trait x0[]:  // error
-     trait x1[x1 <:x0]
+     trait x1[x1 <:x0] // error: type x0 takes type parameters
      extends x1[  // error
 // error
diff --git a/tests/neg/unapplied-types.scala b/tests/neg/unapplied-types.scala
@@ -0,0 +1,7 @@
+trait T {
+  type L[X] = List[X]
+  type T1 <: L    // error: takes type parameters
+  type T2 = L     // error: takes type parameters
+  type T3 = List  // error: takes type parameters
+  type T4 <: List // error: takes type parameters
+}
diff --git a/tests/pos-macros/i6588.scala b/tests/pos-macros/i6588.scala
@@ -15,7 +15,7 @@ def main(using QuoteContext) = {
   foo[U]
   foo[List[Int]]
 
-  type N = List
+  type N[+X] = List[X]
   foo[N]
   foo[List]
 
diff --git a/tests/pos/X.scala b/tests/pos/X.scala
@@ -1,14 +1,10 @@
-abstract class A() {
+import scala.deriving._
 
-  var x: Int
+trait FunctorK[F[_[_]]]
+object FunctorK {
+  given [C] as FunctorK[[F[_]] =>> C] {}
+  given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]
 
-}
-
-abstract class B() extends A() {
-
-  var xx: Int = 0;
-
-  def x = xx;
-  def x_=(y: Int) = xx = y;
+  def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
 }
 
diff --git a/tests/pos/hk-subtyping.scala b/tests/pos/hk-subtyping.scala
@@ -5,7 +5,7 @@ object Test {
   compare[Int, Int]
   compare[Int, Any]
 
-  def f[C <: List] = {
+  def f[C <: [X] =>> List[X]] = {
     compare[C[Int], List[Int]]
   }
 
diff --git a/tests/pos/i2232.scala b/tests/pos/i2232.scala
@@ -8,15 +8,15 @@ object Cats {
     [A, B] =>> C[({type l[c0[_], c1[_, _]] = c1[A, B]})#l]
 
   trait Category[C[_[_[_], _[_, _]]]] {
-    type ->  = Cats.Cat[C]
-    type Obj = Cats.Obj[C]
+    type -> [X, Y] = Cats.Cat[C][X, Y]
+    type Obj[X] = Cats.Obj[C][X]
 
     def id[A: Obj]: A -> A
     def andThen[A, B, C](ab: A -> B, bc: B -> C): A -> C
   }
 
   object Category {
-    type ByF[F[_, _]] = Category[_] { type -> = F }
+    type ByF[F[_, _]] = Category[_] { type -> [X, Y] = F[X, Y] }
   }
 
   type Scal[f[_[_], _[_, _]]] = f[Trivial, Function1]
@@ -28,10 +28,10 @@ object Cats {
 
   implicit class CategoryOps[F[_, _], A, B](ab: F[A, B]) {
     def >>>[C](bc: F[B, C])(implicit F: Category.ByF[F]): F[A, C] =
-      F.andThen(ab, bc)
+      ??? // F.andThen(ab, bc)  -- disabled since it does not typecheck
   }
 
   val f: Int => Int = _ + 1
   val g: Int => String = _.toString
-  f >>> g   // error: no implicit arg found
+  f >>> g
 }
diff --git a/tests/pos/i3139.scala b/tests/pos/i3139.scala
@@ -5,7 +5,3 @@ trait Foo[T] {
 object Test {
   def foo[T](ev: Foo[T]): Foo[T] { type Base[A] = ev.Base[A] } = ev
 }
-
-object Test2 {
-  def foo[T](ev: Foo[T]): Foo[T] { type Base = ev.Base } = ev
-}
diff --git a/tests/pos/i3658.scala b/tests/pos/i3658.scala
@@ -2,7 +2,7 @@ object App {
   def main(args: Array[String]): Unit = {
     trait ModuleSig {
       type F[_]
-      type Type = F
+      type Type[X] = F[X]
 
       def subst[F[_[_]]](fa: F[List]): F[Type]
     }
diff --git a/tests/pos/i5574.scala b/tests/pos/i5574.scala
@@ -6,7 +6,7 @@ object i5574 {
   transparent inline def foo[T]: Any =
     inline erasedValue[T] match {
       case _: Box[f] =>
-        type t = f
+        type t[X] = f[X]
         23
     }
 
diff --git a/tests/pos/i6014-gadt.scala b/tests/pos/i6014-gadt.scala
@@ -31,7 +31,7 @@ object Test3 {
 
   type K1Top = [t] =>> Any
 
-  class Foo[F <: K1Top]
+  class Foo[F[X] <: K1Top[X]]
 
   inline def bar[T] = inline erasedValue[T] match {
     case _: Foo[f] => summon[f[Int]]
diff --git a/tests/pos/i6159.scala b/tests/pos/i6159.scala
@@ -3,7 +3,7 @@ trait B extends A
 
 object O {
   opaque type T[X <: A] = X
-  type U = T.U
+  type U[X <: A] = T.U[X]
   object T{
     type U[X <: A] = X
     def t(a: T[B]): T[B] = a
diff --git a/tests/pos/i7219.scala b/tests/pos/i7219.scala
@@ -24,8 +24,8 @@ object Test {
     def x6: D[Int] = D()
   }
   export Types._
-  type D1 = Types.D
-  type U1 = Types.UC
+  type D1[X] = Types.D[X]
+  type U1[X] = Types.UC[X]
 
   val y1: T = x1
   val y2: U = x2
diff --git a/tests/pos/mirror-implicit-scope.scala b/tests/pos/mirror-implicit-scope.scala
@@ -9,7 +9,7 @@ object Test {
   }
 
   object K1 {
-    type Generic[F[_]] = Mirror { type Scope = K1.type ; type MirroredType = F ; type MirroredElemTypes[_] }
+    type Generic[F[_]] = Mirror { type Scope = K1.type ; type MirroredType = [X] =>> F[X] ; type MirroredElemTypes[_] }
     extension on [F[_] <: Product, T](gen: Generic[F]) {
       inline def toRepr (t: F[T]): gen.MirroredElemTypes[T] = Tuple.fromProduct(t).asInstanceOf
     }
diff --git a/tests/pos/opaque-groups.scala b/tests/pos/opaque-groups.scala
@@ -32,7 +32,7 @@ package object groups {
 
   opaque type First[A] = A
   object First extends Wrapper {
-    type F = First
+    type F[A] = First[A]
     def wraps[G[_], A](ga: G[A]): G[First[A]] = ga
     def unwrap[G[_], A](gfa: G[First[A]]): G[A] = gfa
     implicit def firstSemigroup[A]: Semigroup[First[A]] =
@@ -41,7 +41,7 @@ package object groups {
 
   opaque type Last[A] = A
   object Last extends Wrapper {
-    type F = Last
+    type F[A] = Last[A]
     def wraps[G[_], A](ga: G[A]): G[Last[A]] = ga
     def unwrap[G[_], A](gfa: G[Last[A]]): G[A] = gfa
     implicit def lastSemigroup[A]: Semigroup[Last[A]] =
@@ -50,7 +50,7 @@ package object groups {
 
   opaque type Min[A] = A
   object Min extends Wrapper {
-    type F = Min
+    type F[A] = Min[A]
     def wraps[G[_], A](ga: G[A]): G[Min[A]] = ga
     def unwrap[G[_], A](gfa: G[Min[A]]): G[A] = gfa
     implicit def minSemigroup[A](implicit o: Ordering[A]): Semigroup[Min[A]] =
@@ -59,7 +59,7 @@ package object groups {
 
   opaque type Max[A] = A
   object Max extends Wrapper {
-    type F = Max
+    type F[A] = Max[A]
     def wraps[G[_], A](ga: G[A]): G[Max[A]] = ga
     def unwrap[G[_], A](gfa: G[Max[A]]): G[A] = gfa
     implicit def maxSemigroup[A](implicit o: Ordering[A]): Semigroup[Max[A]] =
@@ -68,7 +68,7 @@ package object groups {
 
   opaque type Plus[A] = A
   object Plus extends Wrapper {
-    type F = Plus
+    type F[A] = Plus[A]
     def wraps[G[_], A](ga: G[A]): G[Plus[A]] = ga
     def unwrap[G[_], A](gfa: G[Plus[A]]): G[A] = gfa
     implicit def plusSemigroup[A](implicit n: Numeric[A]): Semigroup[Plus[A]] =
@@ -77,7 +77,7 @@ package object groups {
 
   opaque type Times[A] = A
   object Times extends Wrapper {
-    type F = Times
+    type F[A] = Times[A]
     def wraps[G[_], A](ga: G[A]): G[Times[A]] = ga
     def unwrap[G[_], A](gfa: G[Times[A]]): G[A] = gfa
     implicit def timesSemigroup[A](implicit n: Numeric[A]): Semigroup[Times[A]] =
@@ -86,7 +86,7 @@ package object groups {
 
   opaque type Reversed[A] = A
   object Reversed extends Wrapper {
-    type F = Reversed
+    type F[A] = Reversed[A]
     def wraps[G[_], A](ga: G[A]): G[Reversed[A]] = ga
     def unwrap[G[_], A](gfa: G[Reversed[A]]): G[A] = gfa
     implicit def reversedOrdering[A](implicit o: Ordering[A]): Ordering[Reversed[A]] =
@@ -95,7 +95,7 @@ package object groups {
 
   opaque type Unordered[A] = A
   object Unordered extends Wrapper {
-    type F = Unordered
+    type F[A] = Unordered[A]
     def wraps[G[_], A](ga: G[A]): G[Unordered[A]] = ga
     def unwrap[G[_], A](gfa: G[Unordered[A]]): G[A] = gfa
     implicit def unorderedOrdering[A]: Ordering[Unordered[A]] =
diff --git a/tests/pos/polyalias.scala b/tests/pos/polyalias.scala
@@ -1,7 +1,7 @@
 
 object Test {
 
-  type S = scala.Predef.Set
+  type S[X] = scala.Predef.Set[X]
 
   val z: S[_] = ???
 
diff --git a/tests/pos/typeclass-encoding2.scala b/tests/pos/typeclass-encoding2.scala
diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala
diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_2.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_2.scala
diff --git a/tests/run/curried-mirror.scala b/tests/run/curried-mirror.scala
diff --git a/tests/run/i4557.scala b/tests/run/i4557.scala
diff --git a/tests/run/implicit-functors2.scala b/tests/run/implicit-functors2.scala
diff --git a/tests/run/poly-kinded-derives.scala b/tests/run/poly-kinded-derives.scala

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ object Test extends App {`
`27`	`27`	`given t2 [T] as Functor[[U] =>> (T, U)] {}`
`28`	`28`	`given t3 [T, U] as Functor[[V] =>> (T, U, V)] {}`
`29`	`29`
`30`		`- def derived[F[_]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}`
	`30`	`+ def derived[F[_]](using m: Mirror { type MirroredType[X] = F[X] ; type MirroredElemTypes[_] }, r: Functor[m.MirroredElemTypes]): Functor[F] = new Functor[F] {}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`case class Mono(i: Int) derives Functor`
`@@ -43,7 +43,7 @@ object Test extends App {`
`43`	`43`	`given [C] as FunctorK[[F[_]] =>> C] {}`
`44`	`44`	`given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]`
`45`	`45`
`46`		`- def derived[F[_[_]]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}`
	`46`	`+ def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`case class Mono(i: Int) derives FunctorK`
`@@ -61,7 +61,7 @@ object Test extends App {`
`61`	`61`	`given t2 as Bifunctor[[T, U] =>> (T, U)] {}`
`62`	`62`	`given t3 [T] as Bifunctor[[U, V] =>> (T, U, V)] {}`
`63`	`63`
`64`		`- def derived[F[_, _]](using m: Mirror { type MirroredType = F ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???`
	`64`	`+ def derived[F[_, _]](using m: Mirror { type MirroredType[X, Y] = F[X, Y] ; type MirroredElemTypes[_, _] }, r: Bifunctor[m.MirroredElemTypes]): Bifunctor[F] = ???`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`case class Mono(i: Int) derives Bifunctor`