fix attaching sources to INTELLIJ-SDK-TEST & IJ-PLUGIN libraries

Author: unkarjedy

ideaSupport/src/main/scala/org/jetbrains/sbtidea/tasks/UpdateWithIDEAInjectionTask.scala

@@ -53,8 +53,12 @@ object UpdateWithIDEAInjectionTask extends SbtIdeaTask[UpdateReport] {
       intellijMainJars.map(mainJarsArtifact -> _) ++ sourcesArtifactMapping
     }
 
-    val ideaTestArtifactMappings: Seq[(sbt.Artifact, File)] =
-      intellijTestJars.map(Artifacts.ideaTestArtifact -> _)
+    val ideaTestArtifactMappings: Seq[(sbt.Artifact, File)] = {
+      //testFramework sources are located in the same archive as main sources
+      val sourcesArtifactMapping = if (attachSources) Seq(Artifacts.ideaTestSourcesArtifact -> intelliJSourcesArchive) else Seq.empty
+      val testJarsArtifact = Artifacts.ideaTestArtifact
+      intellijTestJars.map(testJarsArtifact -> _) ++ sourcesArtifactMapping
+    }
 
     val pluginArtifactsMappings: Seq[(ModuleID, Seq[(Artifact, File)], Configuration)] = intellijPluginClasspath.flatMap { case (_, classpath) =>
       val representativeJar = classpath.headOption
@@ -64,6 +68,7 @@ object UpdateWithIDEAInjectionTask extends SbtIdeaTask[UpdateReport] {
         val pluginModule = f.get(moduleID.key).get
         val pluginArtifact = f.get(artifact.key).get
         val mainArtifactMapping = classpath.map(pluginArtifact -> _.data)
+        //bundled plugin sources are located in the same archive as main sources
         val sourcesArtifactMapping = Artifacts.pluginSourcesArtifact(pluginArtifact.name) -> intelliJSourcesArchive
 
         // bundled plugin has the same version as the platform; add sources

ideaSupport/src/main/scala/org/jetbrains/sbtidea/tasks/classpath/AttributedClasspathTasks.scala

@@ -11,11 +11,18 @@ import scala.collection.mutable
 object AttributedClasspathTasks {
 
   import Artifacts.*
-  import Modules.*
 
   private val INTELLIJ_SDK_ARTIFACT_NAME = "INTELLIJ-SDK"
   private val INTELLIJ_SDK_TEST_ARTIFACT_NAME: String = "INTELLIJ-SDK-TEST"
 
+  // These special classifiers have a special handling logic in Scala plugin and DevKit plugin
+  // See org.jetbrains.sbt.project.SbtProjectResolver.IJ_SDK_CLASSIFIERS
+  // See https://youtrack.jetbrains.com/issue/SCL-17415 (though it doesn't have many details)
+  // NOTE: it seems like it's some legacy and DevKit doesn't actually need this, but it's not 100%
+  // same classifier is used for both main and test jars
+  private val IJ_SDK_CLASSIFIER = "IJ-SDK"
+  private val IJ_PLUGIN_CLASSIFIER = "IJ-PLUGIN"
+
   object Artifacts {
     private val intellijMainJarsHashToArtifactSuffix = mutable.Map[Int, String]()
 
@@ -24,6 +31,9 @@ object AttributedClasspathTasks {
      * (it better shouldn't be so, but it might occur accidentally, e.g., due to misconfiguration)<br>
      * In this case, we want to create different libraries.<br>
      * For this we need unique names
+     *
+     * @return 1. empty string in the simplest case, when all modules depend on the same set of jars from the platform<br>
+     *         2. jars hash code otherwise
      */
     private def getUniqueArtifactSuffix(jars: Seq[File], cache: mutable.Map[Int, String]): String =
       cache.synchronized {
@@ -36,29 +46,34 @@ object AttributedClasspathTasks {
       }
 
     def ideaMainJarsArtifact(intellijMainJarsValue: Seq[File]): Artifact = {
+      //should be empty in simple cases
       val artifactSuffix = getUniqueArtifactSuffix(intellijMainJarsValue, intellijMainJarsHashToArtifactSuffix)
-      Artifact(INTELLIJ_SDK_ARTIFACT_NAME, s"IJ-SDK$artifactSuffix")
+      Artifact(name = INTELLIJ_SDK_ARTIFACT_NAME + artifactSuffix, classifier = IJ_SDK_CLASSIFIER)
     }
 
     val ideaTestArtifact: Artifact =
-      Artifact(INTELLIJ_SDK_TEST_ARTIFACT_NAME, "IJ-SDK-TEST")
+      Artifact(name = INTELLIJ_SDK_TEST_ARTIFACT_NAME, classifier = IJ_SDK_CLASSIFIER)
 
     val ideaSourcesArtifact: Artifact =
-      Artifact(INTELLIJ_SDK_ARTIFACT_NAME, Artifact.SourceType, "zip", "IJ-SDK")
+      Artifact(name = INTELLIJ_SDK_ARTIFACT_NAME, `type` = Artifact.SourceType, extension = "zip", classifier = IJ_SDK_CLASSIFIER)
+
+    val ideaTestSourcesArtifact: Artifact =
+      Artifact(name = INTELLIJ_SDK_TEST_ARTIFACT_NAME, `type` = Artifact.SourceType, extension = "zip", classifier = IJ_SDK_CLASSIFIER)
+
 
     def pluginArtifact(descriptor: PluginDescriptor): Artifact =
-      Artifact(s"IJ-PLUGIN[${descriptor.id}]", "IJ-PLUGIN")
+      Artifact(name = s"IJ-PLUGIN[${descriptor.id}]", classifier = IJ_PLUGIN_CLASSIFIER)
 
     def pluginSourcesArtifact(pluginName: String): Artifact =
-      Artifact(pluginName, Artifact.SourceType, "zip", Artifact.SourceClassifier)
+      Artifact(name = pluginName, `type` = Artifact.SourceType, extension = "zip", classifier = IJ_PLUGIN_CLASSIFIER)
   }
 
   object Modules {
     def getIntellijSdkModule(buildNumber: String): ModuleID =
       "org.jetbrains" % INTELLIJ_SDK_ARTIFACT_NAME % buildNumber withSources()
 
     def getIntellijSdkTestModule(buildNumber: String): ModuleID =
-      "org.jetbrains" % INTELLIJ_SDK_TEST_ARTIFACT_NAME % buildNumber % Test
+      "org.jetbrains" % INTELLIJ_SDK_TEST_ARTIFACT_NAME % buildNumber % Test withSources()
   }
 
   //======= ATTRIBUTED CLASSPATH =======
@@ -79,7 +94,7 @@ object AttributedClasspathTasks {
     buildNumber: String
   ): Classpath = {
     val artifact = ideaMainJarsArtifact(jars)
-    val module = getIntellijSdkModule(buildNumber)
+    val module = Modules.getIntellijSdkModule(buildNumber)
     buildAttributedClasspath(jars)(artifact, module, Compile)
   }
 
@@ -88,7 +103,7 @@ object AttributedClasspathTasks {
     buildNumber: String
   ): Classpath = {
     val artifact = ideaTestArtifact
-    val module = getIntellijSdkTestModule(buildNumber)
+    val module = Modules.getIntellijSdkTestModule(buildNumber)
     buildAttributedClasspath(jars)(artifact, module, Test)
   }