Fix CI to make up for latest changes in dotty (#6181)

* Fix CI to make up for latest changes in dotty * Properly mark nightly versions
scalameta · Mar 5, 2024 · c95ba51 · c95ba51
1 parent 34e2213
commit c95ba51
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionInterpolatorSuite.scala
@@ -54,11 +54,11 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
 
   checkEdit(
     "string2",
-    s"""|object Main {
-        |  val myName = ""
-        |  def message = "$$myNa@@me"
-        |}
-        |""".stripMargin,
+    """|object Main {
+       |  val myName = ""
+       |  def message = "$myNa@@me"
+       |}
+       |""".stripMargin,
     """|object Main {
        |  val myName = ""
        |  def message = s"${myName$0}me"
@@ -371,7 +371,7 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
       )
     ),
     """|object Main {
-       |  
+       |
        |  s"Hello $List.e@@ "
        |}
        |""".stripMargin,
@@ -593,8 +593,10 @@ class CompletionInterpolatorSuite extends BaseCompletionSuite {
     filter = _.contains("hello")
   )
 
+  // This case will not be supported as every modern editor automatically insterts closing brace
+  // and it is non trivial to correctly find completion query for this scenario.
   checkEditLine(
-    "brace-token-error-pos",
+    "brace-token-error-pos".tag(IgnoreForScala3CompilerPC),
     """|object Main {
        |  val hello = ""
        |  ___

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionKeywordSuite.scala
@@ -46,7 +46,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
                   |""".stripMargin,
       ">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
         """|transparentTrait - scala.annotation (commit: '')
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
     ),
     includeCommitCharacter = true
   )
@@ -77,7 +78,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
            |""".stripMargin,
       ">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
         """|transparentTrait - scala.annotation (commit: '')
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
     ),
     includeCommitCharacter = true
   )
@@ -488,7 +490,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
         """|def
            |derived - scala.CanEqual
            |deprecated - scala.runtime.stdLibPatches.language
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> "def"
     )
   )
 
@@ -513,7 +516,10 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
       "3.4" -> """|val
                   |var
                   |varargs - scala.annotation
-                  |""".stripMargin
+                  |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" ->
+        """|val
+           |var""".stripMargin
     )
   )
 
@@ -605,7 +611,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
            |unsafeNulls - scala.runtime.stdLibPatches.language (commit: '')
            |unused - scala.annotation (commit: '')
            |unshared - scala.annotation.internal (commit: '')
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> "using (commit: '')"
     ),
     topLines = Some(5)
   )
@@ -649,7 +656,8 @@ class CompletionKeywordSuite extends BaseCompletionSuite {
            |unused - scala.annotation
            |unshared - scala.annotation.internal
            |unspecialized - scala.annotation
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
     ),
     topLines = Some(5)
   )

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionPatternSuite.scala
@@ -82,7 +82,8 @@ class CompletionPatternSuite extends BaseCompletionSuite {
       ">=3.4.1-RC1-bin-20240201-hash-NIGHTLY" ->
         """|macros - scala.languageFeature.experimental
            |macroImpl - scala.reflect.macros.internal
-           |""".stripMargin
+           |""".stripMargin,
+      ">=3.4.2-RC1-bin-20240301-hash-NIGHTLY" -> ""
     )
   )