Merge pull request #3011 from dotty-staging/fix-3004

Fix #3004 and simplify exhaustivity check

Author: liufengyun

compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

@@ -1,6 +1,6 @@
-21: Pattern Match Exhaustivity: List(_), List(_, _, _, _*)
+21: Pattern Match Exhaustivity: List(_), List(_, _, _, _: _*)
 27: Pattern Match Exhaustivity: Nil
-32: Pattern Match Exhaustivity: List(_, _*)
+32: Pattern Match Exhaustivity: List(_, _: _*)
 39: Pattern Match Exhaustivity: Bar3
 44: Pattern Match Exhaustivity: (Bar2, Bar2)
 53: Pattern Match Exhaustivity: (Bar2, Bar2), (Bar2, Bar1), (Bar1, Bar3), (Bar1, Bar2)

tests/patmat/exhausting.check

@@ -1,2 +1,2 @@
-15: Pattern Match Exhaustivity: List(_, _*)
+15: Pattern Match Exhaustivity: List(_, _: _*)
 21: Pattern Match Exhaustivity: _: Expr

tests/patmat/i2363.check

@@ -0,0 +1,12 @@
+object O {
+  sealed trait Fruit
+  object Apple extends Fruit
+  object Banana extends Fruit
+  sealed class C(f1: Fruit, f2: Fruit)
+
+  object C {
+    def unapply(c: C): Some[Banana.type] = Some(Banana)
+  }
+
+  def m(c: C) = c match { case C(b) => b }
+}

tests/patmat/i3004.scala

@@ -1 +1 @@
-2: Pattern Match Exhaustivity: List(_, _, _, _*)
+2: Pattern Match Exhaustivity: List(_, _, _, _: _*)

tests/patmat/t4408.check

@@ -1 +1 @@
-2: Pattern Match Exhaustivity: (Nil, List(_, _*)), (List(_, _*), Nil)
+2: Pattern Match Exhaustivity: (Nil, List(_, _: _*)), (List(_, _: _*), Nil)

tests/patmat/t5440.check

@@ -1 +1 @@
-5: Pattern Match Exhaustivity: (_: List, Nil), (_: List, List(true, _*)), (_: List, List(false, _*))
+5: Pattern Match Exhaustivity: (_: List, Nil), (_: List, List(true, _: _*)), (_: List, List(false, _: _*))

tests/patmat/t6420.check

@@ -1,4 +1,4 @@
-3: Pattern Match Exhaustivity: List(_, _*)
-10: Pattern Match Exhaustivity: List(_, _*)
-17: Pattern Match Exhaustivity: List(_, _*)
-24: Pattern Match Exhaustivity: List(_, _*)
+3: Pattern Match Exhaustivity: List(_, _: _*)
+10: Pattern Match Exhaustivity: List(_, _: _*)
+17: Pattern Match Exhaustivity: List(_, _: _*)
+24: Pattern Match Exhaustivity: List(_, _: _*)

tests/patmat/t7020.check

@@ -1 +1,3 @@
-13: Pattern Match Exhaustivity: Node2(), Node1(Foo(_))
+13: Pattern Match Exhaustivity: Node2()
+17: Pattern Match Exhaustivity: Node2(), Node1(Foo(Nil)), Node1(Foo(List(_, _: _*)))
+21: Pattern Match Exhaustivity: Node2(), Node1(Foo(Nil))

tests/patmat/t9232.check

@@ -11,6 +11,14 @@ case class Node2() extends Tree
 
 object Test {
   def transformTree(tree: Tree): Any = tree match {
-    case Node1(Foo(1)) => ???
+    case Node1(Foo(_: _*)) => ???
+  }
+
+  def transformTree2(tree: Tree): Any = tree match {
+    case Node1(Foo(1, _: _*)) => ???
+  }
+
+  def transformTree3(tree: Tree): Any = tree match {
+    case Node1(Foo(x, _: _*)) => ???
   }
 }