Merge pull request #11526 from dotty-staging/improve-11327

Harden type checking for enum values

Author: smarter

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

@@ -3809,7 +3809,7 @@ class Typer extends Namer
               mapOver(tp)
         }
 
-        if tree.symbol.is(Module)
+        if tree.symbol.isOneOf(Module | Enum)
            && !(tree.tpe frozen_<:< pt) // fast track
            && !(tree.tpe frozen_<:< approx(pt))
         then

scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala

@@ -22,8 +22,6 @@ object ScalaSignatureProvider:
         givenClassSignature(documentable, cls, builder)
       case Kind.Given(d: Kind.Def, _, _) =>
         givenMethodSignature(documentable, d, builder)
-      case Kind.Given(Kind.Val, _, _) =>
-        givenPropertySignature(documentable, builder)
       case cls: Kind.Class =>
         classSignature(documentable, cls, builder)
       case enm: Kind.Enum =>

tests/neg/i9740b.scala

@@ -0,0 +1,19 @@
+enum Recovery:
+  case RecoveryCompleted
+
+enum TypedRecovery:
+  case TypedRecoveryCompleted
+
+import Recovery.*
+import TypedRecovery.*
+
+class Test {
+  TypedRecoveryCompleted match {
+    case RecoveryCompleted => println("Recovery completed")            // error
+    case TypedRecoveryCompleted => println("Typed recovery completed")
+  }
+
+  def foo(x: TypedRecovery) = x match
+    case RecoveryCompleted =>             // error
+    case TypedRecoveryCompleted =>
+}

tests/run/option-extract.scala

@@ -6,7 +6,7 @@ enum Option[+A]:
   opaque type ExtractResult[B] = (=> B) => B
 
   def extract[B](f: A => B): ExtractResult[B] =
-    def result(default: => B): B = this match
+    def result(default: => B): B = (this: Option[A]) match
       case None => default
       case Some(elem) => f(elem)
     result