Disallow type parameters in OnlyCapability annotations

Author: noti0na1

compiler/src/dotty/tools/dotc/cc/CaptureOps.scala

@@ -922,8 +922,11 @@ object OnlyCapability:
 
   def unapply(tree: AnnotatedType)(using Context): Option[(Type, ClassSymbol)] = tree match
     case AnnotatedType(parent: Type, ann) if ann.hasSymbol(defn.OnlyCapabilityAnnot) =>
-      ann.tree.tpe.argTypes.head.classSymbol match
-        case cls: ClassSymbol => Some((parent, cls))
+      ann.tree.tpe.argTypes.head.dealias match
+        case tp: TypeRef if tp.symbol.isClass =>
+          tp.symbol match
+            case cls: ClassSymbol => Some((parent, cls))
+            case _ => None
         case _ => None
     case _ => None
 end OnlyCapability

tests/neg-custom-args/captures/classified-tp.check

@@ -0,0 +1,17 @@
+-- Error: tests/neg-custom-args/captures/classified-tp.scala:11:17 -----------------------------------------------------
+11 |  val c: AnyRef^{any.only[C]} = new AnyRef // error
+   |                 ^^^^^^^^^^^
+   |                 scala.caps.any.type @onlyCapability[C] is not a legal element of a capture set
+   |
+   |                 where:    C is a type in method test with bounds <: B
+-- Error: tests/neg-custom-args/captures/classified-tp.scala:12:17 -----------------------------------------------------
+12 |  val d: AnyRef^{any.only[D]} = new AnyRef // error
+   |                 ^^^^^^^^^^^
+   |                 scala.caps.any.type @onlyCapability[D] is not a legal element of a capture set
+   |
+   |                 where:    D is a type in method test with bounds <: scala.caps.Classifier
+-- Error: tests/neg-custom-args/captures/classified-tp.scala:13:17 -----------------------------------------------------
+13 |  val e: AnyRef^{any.only[E]} = new AnyRef // error
+   |                 ^^^^^^^^^^^
+   |             scala.caps.any.only[E] is not well-formed since trait E is not a classifier class.
+   |             A classifier class is a class extending `caps.Capability` and directly extending `caps.Classifier`.

tests/neg-custom-args/captures/classified-tp.scala

@@ -0,0 +1,13 @@
+import language.experimental.captureChecking
+import caps.*
+
+trait A extends Classifier, SharedCapability
+trait B extends A, Classifier
+trait E
+
+def test[C <: B, D <: Classifier] =
+  val a: AnyRef^{any.only[A]} = new AnyRef
+  val b: AnyRef^{any.only[B]} = new AnyRef
+  val c: AnyRef^{any.only[C]} = new AnyRef // error
+  val d: AnyRef^{any.only[D]} = new AnyRef // error
+  val e: AnyRef^{any.only[E]} = new AnyRef // error