Merged branch idea241.release into idea241.x

Author: builduser

sbt/sbt-impl/test/org/jetbrains/sbt/project/SbtOptsTest.scala

@@ -102,5 +102,4 @@ class SbtOptsTest {
     doTest(""" -d -sbt-dir "" """, Seq("-d", "-sbt-dir", ""))
     doTest("-d -sbt-dir -dummy", Seq("-d", "-sbt-dir", "-dummy"))
   }
-
 }

scala/integration/maven/src/org/jetbrains/plugins/scala/project/maven/ScalaMavenImporter.scala

@@ -118,7 +118,7 @@ final class ScalaMavenImporter extends MavenImporter("org.scala-tools", "maven-s
      *
      * @see [[implicitScalaLibraryIfNeeded]]
      */
-    val scalaLibraryToMarkAsSdk: Option[(Library, Version)] = {
+    val scalaLibraryToMarkAsSdk: Either[Unit, Option[(Library, Version)]] = {
       val expectedLibraryName = scalaCompilerArtifactName("library", compilerVersion.presentation)
       val moduleModel = modelsProvider.getModifiableRootModel(module)
 
@@ -144,36 +144,42 @@ final class ScalaMavenImporter extends MavenImporter("org.scala-tools", "maven-s
         librariesWithSameMajorVersion.maxByOption(_._2)
       }
 
-      libraryEntriesGroupedByScope.iterator
-        .flatMap { case _ -> entries =>  selectScalaLibrary(entries) }
-        .nextOption()
+      // TODO - this workaround should be removed when #IDEA-348826 is merged to IDEA 2024.1 (around 20.04)
+      if (libraryEntriesGroupedByScope.isEmpty) Left(())
+      else {
+        val selectedLibrary = libraryEntriesGroupedByScope.iterator
+          .flatMap { case _ -> entries =>  selectScalaLibrary(entries) }
+          .nextOption()
+        Right(selectedLibrary)
+      }
     }
 
-    scalaLibraryToMarkAsSdk match {
-      case Some((scalaLibrary, scalaLibraryVersion)) =>
-        val compilerClasspathFull = module.getProject.getUserData(MavenFullCompilerClasspathKey)
-
-        val compilerBridgeBinaryJar =
-          ScalaSdkUtils.compilerBridgeJarName(scalaLibraryVersion.presentation).flatMap { bridgeJarName =>
-            compilerClasspathFull.find(_.getName == bridgeJarName)
-          }
-
-        val classpath = compilerClasspathFull.diff(compilerBridgeBinaryJar.toSeq)
-
-        ScalaSdkUtils.ensureScalaLibraryIsConvertedToScalaSdk(
-          modelsProvider,
-          scalaLibrary,
-          Some(scalaLibraryVersion.presentation),
-          classpath,
-          scaladocExtraClasspath = Nil, // TODO SCL-17219
-          compilerBridgeBinaryJar = compilerBridgeBinaryJar
-        )
-      case None =>
-        val msg = s"Cannot find project Scala library ${compilerVersion.presentation} for module ${module.getName}"
-        val exception = new IllegalArgumentException(msg)
-        val console = MavenProjectsManager.getInstance(module.getProject).getSyncConsole
-        console.addException(exception)
-    }
+    scalaLibraryToMarkAsSdk.foreach {
+          case Some((scalaLibrary, scalaLibraryVersion)) =>
+            val compilerClasspathFull = module.getProject.getUserData(MavenFullCompilerClasspathKey)
+            if (compilerClasspathFull == null) return
+
+            val compilerBridgeBinaryJar =
+              ScalaSdkUtils.compilerBridgeJarName(scalaLibraryVersion.presentation).flatMap { bridgeJarName =>
+                compilerClasspathFull.find(_.getName == bridgeJarName)
+              }
+
+            val classpath = compilerClasspathFull.diff(compilerBridgeBinaryJar.toSeq)
+
+            ScalaSdkUtils.ensureScalaLibraryIsConvertedToScalaSdk(
+              modelsProvider,
+              scalaLibrary,
+              Some(scalaLibraryVersion.presentation),
+              classpath,
+              scaladocExtraClasspath = Nil, // TODO SCL-17219
+              compilerBridgeBinaryJar = compilerBridgeBinaryJar
+            )
+          case None =>
+            val msg = s"Cannot find project Scala library ${compilerVersion.presentation} for module ${module.getName}"
+            val exception = new IllegalArgumentException(msg)
+            val console = MavenProjectsManager.getInstance(module.getProject).getSyncConsole
+            console.addException(exception)
+      }
   }
 
   // called before `process`