From ed5ddfe85c86b8d7c34e0c6a1192f2c3e4ec1ae9 Mon Sep 17 00:00:00 2001
From: Eugene Flesselle <eugene@flesselle.net>
Date: Fri, 15 Mar 2024 13:17:42 +0100
Subject: [PATCH] Update check-files and remove i18488.scala

i18488.scala was only passing because of the bug in the MatchReducer,
as we can see in the subtyping trace:
```
==> isSubType TableQuery[BaseCrudRepository.this.EntityTable] <:< Query[BaseCrudRepository.this.EntityTable, E[Option]]?
  ==> isSubType Query[BaseCrudRepository.this.EntityTable, Extract[BaseCrudRepository.this.EntityTable]] <:<
                Query[BaseCrudRepository.this.EntityTable, E[Option]] (left is approximated)?
    ==> isSubType E[Option] <:< Extract[BaseCrudRepository.this.EntityTable]?
      ==> isSubType [T[_$1]] =>> Any <:< Extract?
        ==> isSubType Any <:< Extract[T]?
          ==> isSubType Any <:< T match { case AbstractTable[t] => t } <: t (right is approximated)?
            ==> isSubType Any <:< <error Match type reduction failed since selector T
                                   matches none of the cases
                                   case AbstractTable[t] => t> (right is approximated)?
            <== isSubType Any <:< <error Match type reduction failed since selector T
                                   matches none of the cases
                                   case AbstractTable[t] => t> (right is approximated) = true
          <== isSubType Any <:< T match { case AbstractTable[t] => t } <: t (right is approximated) = true
        <== isSubType Any <:< Extract[T] = true
      <== isSubType [T[_$1]] =>> Any <:< Extract = true
      ...
    <== isSubType Extract[BaseCrudRepository.this.EntityTable] <:< E[Option] = true
  <== isSubType Query[BaseCrudRepository.this.EntityTable, Extract[BaseCrudRepository.this.EntityTable]] <:<
                Query[BaseCrudRepository.this.EntityTable, E[Option]] (left is approximated) = true
<== isSubType TableQuery[BaseCrudRepository.this.EntityTable] <:< Query[BaseCrudRepository.this.EntityTable, E[Option]] = true
```
---
 tests/neg/i12049.check                    |  4 ++--
 tests/neg/i13757-match-type-anykind.scala |  4 ++--
 tests/pos/i18488.scala                    | 15 ---------------
 3 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 tests/pos/i18488.scala

diff --git a/tests/neg/i12049.check b/tests/neg/i12049.check
index 11c648e35a57..4977b8d8c591 100644
--- a/tests/neg/i12049.check
+++ b/tests/neg/i12049.check
@@ -18,7 +18,7 @@
 -- Error: tests/neg/i12049.scala:14:23 ---------------------------------------------------------------------------------
 14 |val y3: String = ??? : Last[Int *: Int *: Boolean *: String *: EmptyTuple]  // error
    |                       ^
-   |                       Match type reduction failed since selector EmptyTuple.type
+   |                       Match type reduction failed since selector EmptyTuple
    |                       matches none of the cases
    |
    |                           case _ *: _ *: t => Last[t]
@@ -48,7 +48,7 @@
 -- Error: tests/neg/i12049.scala:25:26 ---------------------------------------------------------------------------------
 25 |val _ = summon[String =:= Last[Int *: Int *: Boolean *: String *: EmptyTuple]] // error
    |                          ^
-   |                          Match type reduction failed since selector EmptyTuple.type
+   |                          Match type reduction failed since selector EmptyTuple
    |                          matches none of the cases
    |
    |                              case _ *: _ *: t => Last[t]
diff --git a/tests/neg/i13757-match-type-anykind.scala b/tests/neg/i13757-match-type-anykind.scala
index d8273e546dab..3feb9907fb69 100644
--- a/tests/neg/i13757-match-type-anykind.scala
+++ b/tests/neg/i13757-match-type-anykind.scala
@@ -1,11 +1,11 @@
 object Test:
-  type AnyKindMatchType1[X <: AnyKind] = X match // error: the scrutinee of a match type cannot be higher-kinded // error
+  type AnyKindMatchType1[X <: AnyKind] = X match // error: the scrutinee of a match type cannot be higher-kinded
     case Option[a] => Int
 
   type AnyKindMatchType2[X <: AnyKind] = X match // error: the scrutinee of a match type cannot be higher-kinded
     case Option => Int // error: Missing type parameter for Option
 
-  type AnyKindMatchType3[X <: AnyKind] = X match // error: the scrutinee of a match type cannot be higher-kinded // error
+  type AnyKindMatchType3[X <: AnyKind] = X match // error: the scrutinee of a match type cannot be higher-kinded
     case _ => Int
 
   type AnyKindMatchType4[X <: Option] = X match // error // error: the scrutinee of a match type cannot be higher-kinded // error
diff --git a/tests/pos/i18488.scala b/tests/pos/i18488.scala
deleted file mode 100644
index c225a2c20711..000000000000
--- a/tests/pos/i18488.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-trait AbstractTable[T]
-
-trait Query[E, U]
-
-class TableQuery[E <: AbstractTable[?]] extends Query[E, Extract[E]]
-
-type Extract[E] = E match
-  case AbstractTable[t] => t
-
-trait BaseCrudRepository[E[T[_]]]:
-
-  type EntityTable <: AbstractTable[E[Option]]
-
-  def filterById: Query[EntityTable, Extract[EntityTable]] =
-    new TableQuery[EntityTable]