Merge pull request #497 from ckipp01/millJava

Author: olafurpg

build.sbt

@@ -24,7 +24,7 @@ lazy val V =
     def testcontainers = "0.39.3"
     def requests = "0.6.5"
     def minimalMillVersion = "0.10.0"
-    def millScipVersion = "0.2.3"
+    def millScipVersion = "0.3.0"
   }
 
 inThisBuild(

docs/getting-started.md

@@ -243,7 +243,7 @@ free to subscribe to the tracking issues to receive updates on your build tool.
 | Ant        | ❌   | ❌    | ❌     | [sourcegraph/scip-java#305](https://github.com/sourcegraph/scip-java/issues/305) |
 | Bazel      | ✅   | ✅    | ❌     |                                                                                  |
 | Buck       | ❌   | ❌    | ❌     | [sourcegraph/scip-java#99](https://github.com/sourcegraph/scip-java/issues/99)   |
-| Mill       | ❌   | ✅    | ❌     | 
+| Mill       | ✅   | ✅    | ❌     | 
 
 **✅**: automatic indexing is fully supported. Please report a bug if the
 `scip-java index` command does not work on your codebase.
@@ -304,9 +304,10 @@ projects, with the following caveats:
 The `scip-java index` build should be able to automatically index most Mill 
 projects, with the following caveats:
 
-| Integration   | Supported | Recommendation             |
-| ------------- | --------- | -------------------------- |
-| Mill <v0.10.0 | ❌        | Upgrade to Mill >= v0.10.0 |
+| Integration   | Supported           | Recommendation                             |
+| ------------- | --------------------| -------------------------------------------|
+| Mill <v0.10.0 | ❌                  | Upgrade to Mill >= v0.10.0                 |
+| Mill <v0.10.6 | Only supports Scala | Upgrade to Mill >= v0.10.6 for Java support|
 
 
 ### Bazel

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/MillBuildTool.scala

@@ -35,6 +35,8 @@ class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {
     1
   }
 
+  private val rawOutput = index.output.toString
+
   private def unconditionallyGenerateScip(): Int = {
     val localMill = Files.isRegularFile(millFile)
     val command =
@@ -46,9 +48,12 @@ class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {
     val millProcess = index.process(
       List(
         command,
+        "--no-server",
         "--import",
         s"ivy:io.chris-kipp::mill-scip::${BuildInfo.millScipVersion}",
-        "io.kipp.mill.scip.Scip/generate"
+        "io.kipp.mill.scip.Scip/generate",
+        "--output",
+        rawOutput
       )
     )
     val scipFile = index
@@ -60,10 +65,10 @@ class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {
       .resolve("scip")
       .resolve("Scip")
       .resolve("generate.dest")
-      .resolve("index.scip")
+      .resolve(rawOutput)
 
     if (millProcess.exitCode == 0 && Files.isRegularFile(scipFile)) {
-      val output = index.workingDirectory.resolve("index.scip")
+      val output = index.workingDirectory.resolve(rawOutput)
       Files.copy(scipFile, output, StandardCopyOption.REPLACE_EXISTING)
       index.app.info(output.toString)
     }

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java

@@ -55,8 +55,8 @@ public static SemanticdbJavacOptions parse(String[] args, Context ctx) {
         }
       } else if (arg.startsWith("-sourceroot:")) {
         result.sourceroot = Paths.get(arg.substring("-sourceroot:".length())).normalize();
-      } else if (arg.equals("-build-tool:sbt")) {
-        result.uriScheme = UriScheme.SBT;
+      } else if (arg.equals("-build-tool:sbt") || args.equals("-build-tool:mill")) {
+        result.uriScheme = UriScheme.ZINC;
       } else if (arg.equals("-build-tool:bazel")) {
         result.uriScheme = UriScheme.BAZEL;
         useJavacClassesDir = true;

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTaskListener.java

@@ -102,7 +102,7 @@ private void writeSemanticdb(TaskEvent event, Path output, Semanticdb.TextDocume
 
   public static Path absolutePathFromUri(SemanticdbJavacOptions options, JavaFileObject file) {
     URI uri = file.toUri();
-    if (options.uriScheme == UriScheme.SBT
+    if ((options.uriScheme == UriScheme.SBT || options.uriScheme == UriScheme.ZINC)
         && uri.getScheme().equals("vf")
         && uri.toString().startsWith("vf://tmp/")) {
       String[] parts = uri.toString().split("/", 5);

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/UriScheme.java

@@ -2,6 +2,9 @@
 
 public enum UriScheme {
   DEFAULT,
+  /** @deprecated Use ZINC instead */
+  @Deprecated
   SBT,
-  BAZEL
+  BAZEL,
+  ZINC
 }

tests/buildTools/src/test/scala/tests/MillBuildToolSuite.scala

@@ -9,7 +9,7 @@ import scala.jdk.CollectionConverters._
 
 class MillBuildToolSuite extends BaseBuildToolSuite {
 
-  def setupMill() = {
+  def setupMill(millVersion: String) = {
     val mill = workingDirectory.resolve("mill")
     val resource = getClass().getResource("/mill")
     val in = Paths.get(resource.toURI)
@@ -24,7 +24,7 @@ class MillBuildToolSuite extends BaseBuildToolSuite {
         PosixFilePermission.OWNER_EXECUTE
       ).asJava
     )
-    List("./mill", "--version")
+    List("./mill", s"--mill-version", millVersion, "--version")
   }
 
   def scalaLibrary(scalaVersion: String) =
@@ -92,8 +92,49 @@ class MillBuildToolSuite extends BaseBuildToolSuite {
             |maven:org.scalameta:junit-interface:1.0.0-M6
             |maven:org.scalameta:munit_${scalaBinaryVersion(scalaVersion)}:1.0.0-M6
             |""".stripMargin,
-      initCommand = setupMill(),
+      initCommand = setupMill(millVersion),
       targetRoot = Some("out/io/kipp/mill/scip/Scip/generate.dest")
     )
   }
+
+  checkBuild(
+    "java-module",
+    s"""|/.mill-version
+        |0.10.7
+        |/build.sc
+        |import mill._, scalalib._
+        |object minimal extends JavaModule
+        |/minimal/src/ScipOutputFormat.java
+        |package minimal;
+        |public enum ScipOutputFormat {
+        |  GRAPH_NDJSON,
+        |  GRAPH_PROTOBUF,
+        |  TYPED_PROTOBUF,
+        |  TYPED_NDJSON,
+        |  UNKNOWN;
+        |}
+        |""".stripMargin,
+    expectedSemanticdbFiles = 1,
+    initCommand = setupMill("0.10.7"),
+    targetRoot = Some("out/io/kipp/mill/scip/Scip/generate.dest")
+  )
+
+  checkBuild(
+    "lsif-output",
+    s"""|/.mill-version
+        |0.10.7
+        |/build.sc
+        |import mill._, scalalib._
+        |object minimal extends ScalaModule {
+        |  def scalaVersion = "3.1.3"
+        |}
+        |/minimal/src/Main.scala
+        |package minimal
+        |@main def hello = ()
+        |""".stripMargin,
+    expectedSemanticdbFiles = 1,
+    initCommand = setupMill("0.10.7"),
+    targetRoot = Some("out/io/kipp/mill/scip/Scip/generate.dest"),
+    extraArguments = List("--output", "dump.lsif")
+  )
 }