Merged branch idea243.release into idea243.x

JetBrains · Dec 11, 2024 · 44ba1fc · 44ba1fc
2 parents 52e2a5e + 6e6daba
commit 44ba1fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/scala/compiler-integration/test/org/jetbrains/plugins/scala/CheckTestDataTestBase.scala b/scala/compiler-integration/test/org/jetbrains/plugins/scala/CheckTestDataTestBase.scala
@@ -30,14 +30,15 @@ abstract class CheckTestDataTestBase(testData: Seq[TestData], minScalaVersion: S
        |""".stripMargin.trim
   }
 
+  def buildCompleteSucceedingTestCode(): String =
+    testData
+      .filterNot(_.isFailing)
+      .zipWithIndex
+      .map(wrapIntoObject)
+      .mkString("\n\n")
+
   def test(): Unit = runWithErrorsFromCompiler(getProject) {
-    val completeSucceedingTestCode: String =
-      testData
-        .filterNot(_.isFailing)
-        .zipWithIndex
-        .map(wrapIntoObject)
-        .mkString("\n\n")
-    addFileToProjectSources("test.scala", completeSucceedingTestCode)
+    addFileToProjectSources("test.scala", buildCompleteSucceedingTestCode())
     compiler.make().assertNoProblems(allowWarnings = true)
   }
 

diff --git a/...ration/test/org/jetbrains/plugins/scala/lang/psi/CheckGenerateGivenNameTestDataTest.scala b/...ration/test/org/jetbrains/plugins/scala/lang/psi/CheckGenerateGivenNameTestDataTest.scala
@@ -3,4 +3,11 @@ package org.jetbrains.plugins.scala.lang.psi
 import org.jetbrains.plugins.scala.{CheckTestDataTestBase, LatestScalaVersions}
 
 // checks if the test data in GenerateGivenNameTest.allTests is correct
-class CheckGenerateGivenNameTestDataTest extends CheckTestDataTestBase(GenerateGivenNameTest, LatestScalaVersions.Scala_3_6)
+class CheckGenerateGivenNameTestDataTest extends CheckTestDataTestBase(GenerateGivenNameTest, LatestScalaVersions.Scala_3_6) {
+  override def buildCompleteSucceedingTestCode(): String =
+    s"""
+       |import language.experimental.namedTuples
+       |
+       |${super.buildCompleteSucceedingTestCode()}
+       |""".stripMargin
+}
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/ScalaVersion.scala
@@ -102,7 +102,7 @@ object LatestScalaVersions {
   val Scala_3_3 = new ScalaVersion(ScalaLanguageLevel.Scala_3_3, "4")
   val Scala_3_4 = new ScalaVersion(ScalaLanguageLevel.Scala_3_4, "2")
   val Scala_3_5 = new ScalaVersion(ScalaLanguageLevel.Scala_3_5, "2")
-  val Scala_3_6 = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "1")
+  val Scala_3_6 = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "2")
 
   //
   // Aliases
@@ -118,7 +118,7 @@ object LatestScalaVersions {
   val Scala_3_LTS_RC: ScalaVersion = Scala_3_3.withMinor("5-RC1")
 
   // Scala Next RC
-  val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "2-RC3")
+  val Scala_3_Next_RC = new ScalaVersion(ScalaLanguageLevel.Scala_3_6, "3-RC1")
 
   val allScala2: Seq[ScalaVersion] = Seq(
     Scala_2_9,