Add Kotlin BSP integration test

com-lihaoyi · Oct 7, 2024 · 1f94faa · 1f94faa
1 parent d414956
commit 1f94faa
Show file tree

Hide file tree

Showing 20 changed files with 189 additions and 13 deletions.
diff --git a/bsp/src/mill/bsp/Constants.scala b/bsp/src/mill/bsp/Constants.scala
@@ -6,6 +6,6 @@ private[mill] object Constants {
   val bspProtocolVersion = BuildInfo.bsp4jVersion
   val bspWorkerImplClass = "mill.bsp.worker.BspWorkerImpl"
   val bspWorkerBuildInfoClass = "mill.bsp.worker.BuildInfo"
-  val languages: Seq[String] = Seq("java", "scala")
+  val languages: Seq[String] = Seq("java", "scala", "kotlin")
   val serverName = "mill-bsp"
 }
diff --git a/build.mill b/build.mill
@@ -449,7 +449,8 @@ trait MillBaseTestsModule extends TestModule {
       s"-DTEST_SCALATEST_VERSION=${Deps.TestDeps.scalaTest.dep.version}",
       s"-DTEST_TEST_INTERFACE_VERSION=${Deps.sbtTestInterface.dep.version}",
       s"-DTEST_ZIOTEST_VERSION=${Deps.TestDeps.zioTest.dep.version}",
-      s"-DTEST_ZINC_VERSION=${Deps.zinc.dep.version}"
+      s"-DTEST_ZINC_VERSION=${Deps.zinc.dep.version}",
+      s"-DTEST_KOTLIN_VERSION=${Deps.kotlinCompiler.dep.version}"
     )
   }
 

diff --git a/integration/ide/bsp-server/resources/project/build.mill b/integration/ide/bsp-server/resources/project/build.mill
@@ -1,10 +1,13 @@
 package build
 
 import mill._
-import mill.scalalib._
 
-object `hello-java` extends JavaModule
+object `hello-java` extends scalalib.JavaModule
 
-object `hello-scala` extends ScalaModule {
+object `hello-scala` extends scalalib.ScalaModule {
   def scalaVersion = Option(System.getenv("TEST_SCALA_2_13_VERSION")).getOrElse(???)
 }
+
+object `hello-kotlin` extends kotlinlib.KotlinModule {
+  def kotlinVersion = Option(System.getenv("TEST_KOTLIN_VERSION")).getOrElse(???)
+}
diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-compile-classpaths.json b/integration/ide/bsp-server/resources/snapshots/build-targets-compile-classpaths.json
@@ -8,6 +8,16 @@
         "file:///workspace/hello-java/compile-resources"
       ]
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "classpath": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>.jar",
+        "file:///workspace/hello-kotlin/compile-resources"
+      ]
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-dependency-modules.json b/integration/ide/bsp-server/resources/snapshots/build-targets-dependency-modules.json
@@ -6,6 +6,17 @@
       },
       "modules": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "modules": [
+        {
+          "name": "org.jetbrains.kotlin:kotlin-stdlib",
+          "version": "<kotlin-version>"
+        }
+      ]
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-dependency-sources.json b/integration/ide/bsp-server/resources/snapshots/build-targets-dependency-sources.json
@@ -6,6 +6,15 @@
       },
       "sources": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "sources": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>-sources.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>-sources.jar"
+      ]
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-javac-options.json b/integration/ide/bsp-server/resources/snapshots/build-targets-javac-options.json
@@ -10,6 +10,18 @@
       ],
       "classDirectory": "file:///workspace/out/hello-java/compile.dest/classes"
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "options": [],
+      "classpath": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>.jar",
+        "file:///workspace/hello-kotlin/compile-resources"
+      ],
+      "classDirectory": "file:///workspace/out/hello-kotlin/compile.dest/classes"
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-jvm-run-environments.json b/integration/ide/bsp-server/resources/snapshots/build-targets-jvm-run-environments.json
@@ -14,6 +14,22 @@
       "environmentVariables": {},
       "mainClasses": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "classpath": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>.jar",
+        "file:///workspace/hello-kotlin/compile-resources",
+        "file:///workspace/hello-kotlin/resources",
+        "file:///workspace/out/hello-kotlin/compile.dest/classes"
+      ],
+      "jvmOptions": [],
+      "workingDirectory": "/workspace",
+      "environmentVariables": {},
+      "mainClasses": []
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-jvm-test-environments.json b/integration/ide/bsp-server/resources/snapshots/build-targets-jvm-test-environments.json
@@ -14,6 +14,22 @@
       "environmentVariables": {},
       "mainClasses": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "classpath": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>.jar",
+        "file:///workspace/hello-kotlin/compile-resources",
+        "file:///workspace/hello-kotlin/resources",
+        "file:///workspace/out/hello-kotlin/compile.dest/classes"
+      ],
+      "jvmOptions": [],
+      "workingDirectory": "/workspace",
+      "environmentVariables": {},
+      "mainClasses": []
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-output-paths.json b/integration/ide/bsp-server/resources/snapshots/build-targets-output-paths.json
@@ -6,6 +6,12 @@
       },
       "outputPaths": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "outputPaths": []
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-resources.json b/integration/ide/bsp-server/resources/snapshots/build-targets-resources.json
@@ -6,6 +6,12 @@
       },
       "resources": []
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "resources": []
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-scalac-options.json b/integration/ide/bsp-server/resources/snapshots/build-targets-scalac-options.json
@@ -10,6 +10,18 @@
       ],
       "classDirectory": "file:///workspace/out/hello-java/compile.dest/classes"
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "options": [],
+      "classpath": [
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/<kotlin-version>/kotlin-stdlib-<kotlin-version>.jar",
+        "file:///coursier-cache/https/repo1.maven.org/maven2/org/jetbrains/annotations/<annotations-version>/annotations-<annotations-version>.jar",
+        "file:///workspace/hello-kotlin/compile-resources"
+      ],
+      "classDirectory": "file:///workspace/out/hello-kotlin/compile.dest/classes"
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/build-targets-sources.json b/integration/ide/bsp-server/resources/snapshots/build-targets-sources.json
@@ -12,6 +12,18 @@
         }
       ]
     },
+    {
+      "target": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "sources": [
+        {
+          "uri": "file:///workspace/hello-kotlin/src",
+          "kind": 2,
+          "generated": false
+        }
+      ]
+    },
     {
       "target": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/resources/snapshots/initialize-build-result.json b/integration/ide/bsp-server/resources/snapshots/initialize-build-result.json
@@ -6,19 +6,22 @@
     "compileProvider": {
       "languageIds": [
         "java",
-        "scala"
+        "scala",
+        "kotlin"
       ]
     },
     "testProvider": {
       "languageIds": [
         "java",
-        "scala"
+        "scala",
+        "kotlin"
       ]
     },
     "runProvider": {
       "languageIds": [
         "java",
-        "scala"
+        "scala",
+        "kotlin"
       ]
     },
     "debugProvider": {

diff --git a/integration/ide/bsp-server/resources/snapshots/workspace-build-targets.json b/integration/ide/bsp-server/resources/snapshots/workspace-build-targets.json
@@ -26,6 +26,32 @@
         "javaVersion": "<java-version>"
       }
     },
+    {
+      "id": {
+        "uri": "file:///workspace/hello-kotlin"
+      },
+      "displayName": "hello-kotlin",
+      "baseDirectory": "file:///workspace/hello-kotlin",
+      "tags": [
+        "library",
+        "application"
+      ],
+      "languageIds": [
+        "java"
+      ],
+      "dependencies": [],
+      "capabilities": {
+        "canCompile": true,
+        "canTest": false,
+        "canRun": true,
+        "canDebug": false
+      },
+      "dataKind": "jvm",
+      "data": {
+        "javaHome": "file:///java-home/",
+        "javaVersion": "<java-version>"
+      }
+    },
     {
       "id": {
         "uri": "file:///workspace/hello-scala"

diff --git a/integration/ide/bsp-server/src/BspServerTests.scala b/integration/ide/bsp-server/src/BspServerTests.scala
@@ -45,9 +45,30 @@ object BspServerTests extends UtestIntegrationTestSuite {
             }
         }
 
-        val replaceAll =
-          normalizeLocalValuesForTesting(workspacePath) ++ scalaTransitiveSubstitutions ++ Seq(
-            scalaVersion -> "<scala-version>"
+        val kotlinVersion = sys.props.getOrElse("TEST_KOTLIN_VERSION", ???)
+        val kotlinTransitiveSubstitutions = {
+          val scalaFetchRes = coursierapi.Fetch.create()
+            .addDependencies(coursierapi.Dependency.of(
+              "org.jetbrains.kotlin",
+              "kotlin-stdlib",
+              kotlinVersion
+            ))
+            .fetchResult()
+          scalaFetchRes.getDependencies.asScala
+            .filter(dep => dep.getModule.getOrganization != "org.jetbrains.kotlin")
+            .map { dep =>
+              def basePath(version: String) =
+                s"${dep.getModule.getOrganization.split('.').mkString("/")}/${dep.getModule.getName}/$version/${dep.getModule.getName}-$version"
+              basePath(dep.getVersion) -> basePath(s"<${dep.getModule.getName}-version>")
+            }
+        }
+
+        val replaceAll = normalizeLocalValuesForTesting(workspacePath) ++
+          scalaTransitiveSubstitutions ++
+          kotlinTransitiveSubstitutions ++
+          Seq(
+            scalaVersion -> "<scala-version>",
+            kotlinVersion -> "<kotlin-version>"
           )
 
         compareWithGsonSnapshot(

diff --git a/kotlinlib/src/mill/kotlinlib/KotlinModule.scala b/kotlinlib/src/mill/kotlinlib/KotlinModule.scala
@@ -5,10 +5,11 @@
 package mill
 package kotlinlib
 
-import mill.api.{Loose, PathRef, Result}
+import mill.api.{Loose, PathRef, Result, internal}
 import mill.define.{Command, ModuleRef, Task}
 import mill.kotlinlib.worker.api.KotlinWorker
 import mill.scalalib.api.{CompilationResult, ZincWorkerApi}
+import mill.scalalib.bsp.{BspBuildTarget, BspModule}
 import mill.scalalib.{JavaModule, Lib, ZincWorkerModule}
 import mill.util.Jvm
 import mill.util.Util.millProjectModule
@@ -326,6 +327,13 @@ trait KotlinModule extends JavaModule { outer =>
 
   private[kotlinlib] def internalReportOldProblems: Task[Boolean] = zincReportCachedProblems
 
+  @internal
+  override def bspBuildTarget: BspBuildTarget = super.bspBuildTarget.copy(
+    languageIds = Seq(BspModule.LanguageId.Java, BspModule.LanguageId.Kotlin),
+    canCompile = true,
+    canRun = true
+  )
+
   /**
    * A test sub-module linked to its parent module best suited for unit-tests.
    */

diff --git a/scalalib/src/mill/scalalib/bsp/BspModule.scala b/scalalib/src/mill/scalalib/bsp/BspModule.scala
@@ -46,6 +46,7 @@ object BspModule {
   object LanguageId {
     val Java = "java"
     val Scala = "scala"
+    val Kotlin = "kotlin"
   }
 
   /** Used to define the [[BspBuildTarget.tags]] field. */

diff --git a/testkit/src/mill/testkit/BspServerTestUtil.scala b/testkit/src/mill/testkit/BspServerTestUtil.scala
@@ -149,7 +149,7 @@ object BspServerTestUtil {
           BuildInfo.millVersion,
           b.Bsp4j.PROTOCOL_VERSION,
           workspacePath.toNIO.toUri.toASCIIString,
-          new b.BuildClientCapabilities(List("java", "scala").asJava)
+          new b.BuildClientCapabilities(List("java", "scala", "kotlin").asJava)
         )
       ).get()
 

diff --git a/testkit/src/mill/testkit/IntegrationTester.scala b/testkit/src/mill/testkit/IntegrationTester.scala
@@ -95,6 +95,9 @@ object IntegrationTester {
       Map("MILL_TEST_SUITE" -> this.getClass().toString()) ++
         sys.props.get("TEST_SCALA_2_13_VERSION")
           .map("TEST_SCALA_2_13_VERSION" -> _)
+          .toSeq ++
+        sys.props.get("TEST_KOTLIN_VERSION")
+          .map("TEST_KOTLIN_VERSION" -> _)
           .toSeq
 
     /**