From 7f63e6c7305e136932c072cb4c7ac9b064258d6e Mon Sep 17 00:00:00 2001
From: Jakub Ciesluk <323892@uwr.edu.pl>
Date: Tue, 5 Dec 2023 14:41:31 +0100
Subject: [PATCH] chore: adjust completions tests for value forwarders

---
 .../scala/tests/pc/CompletionDocSuite.scala   |  4 +---
 .../test/scala/tests/pc/CompletionSuite.scala | 23 +------------------
 .../tests/pc/SignatureHelpPatternSuite.scala  |  6 ++++-
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
index 9960f38eb2f..4eb2f1835f3 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionDocSuite.scala
@@ -660,9 +660,7 @@ class CompletionDocSuite extends BaseCompletionSuite {
     includeDocs = true,
     compat = Map(
       "2.13" -> vectorDocs213,
-      "3" -> vectorDocs213,
-      // TODO https://github.com/scalameta/metals/issues/5885
-      ">=3.4.0-RC1-bin-20231127-41e7d95-NIGHTLY" -> "Vector:  scala.collection.immutable"
+      "3" -> vectorDocs213
     )
   )
 
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
index c2c2096d515..2727939d0ad 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionSuite.scala
@@ -28,14 +28,6 @@ class CompletionSuite extends BaseCompletionSuite {
            |""".stripMargin,
       "3" ->
         """|List scala.collection.immutable
-           |List - java.awt
-           |List - java.util
-           |List - scala.collection.immutable
-           |List[A](elems: A*): CC[A]
-           |""".stripMargin,
-      // TODO https://github.com/scalameta/metals/issues/5885
-      ">=3.4.0-RC1-bin-20231127-41e7d95-NIGHTLY" ->
-        """|List:  scala.collection.immutable
            |List - java.awt
            |List - java.util
            |List - scala.collection.immutable
@@ -1073,14 +1065,7 @@ class CompletionSuite extends BaseCompletionSuite {
     """|None scala
        |NoManifest scala.reflect
        |""".stripMargin,
-    topLines = Some(2),
-    compat = Map(
-      // TODO https://github.com/scalameta/metals/issues/5885
-      ">=3.4.0-RC1-bin-20231127-41e7d95-NIGHTLY" ->
-        """|None scala
-           |NoManifest:  scala.reflect
-           |""".stripMargin
-    )
+    topLines = Some(2)
   )
 
   check(
@@ -1110,12 +1095,6 @@ class CompletionSuite extends BaseCompletionSuite {
         """|Some(value) scala
            |Seq scala.collection.immutable
            |Set scala.collection.immutable
-           |""".stripMargin,
-      // TODO https://github.com/scalameta/metals/issues/5885
-      ">=3.4.0-RC1-bin-20231127-41e7d95-NIGHTLY" ->
-        """|Some(value) scala
-           |Seq:  scala.collection.immutable
-           |Set:  scala.collection.immutable
            |""".stripMargin
     )
   )
diff --git a/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala b/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
index 8290aed4ccb..26dab6db8df 100644
--- a/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/SignatureHelpPatternSuite.scala
@@ -19,7 +19,11 @@ class SignatureHelpPatternSuite extends BaseSignatureHelpSuite {
     compat = Map(
       ">=2.13.0" -> """|map[B](f: ((Int, Int)) => B): List[B]
                        |       ^^^^^^^^^^^^^^^^^^^^
-                       |""".stripMargin
+                       |""".stripMargin,
+      ">=3.4.0-RC1-bin-20231206-86565a4-NIGHTLY" ->
+        """|(Int, Int)
+           |      ^^^
+           |""".stripMargin
     )
   )