Merge pull request #26 from olafurpg/fix-javacopts

More fixes

Author: olafurpg

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v13
-      - run: sbt +test
+      - run: sbt scripted +test
   check:
     runs-on: ubuntu-latest
     steps:

build.sbt

@@ -75,5 +75,11 @@ buildInfoKeys := List[BuildInfoKey](
 )
 buildInfoPackage := "com.sourcegraph.sbtsourcegraph"
 enablePlugins(BuildInfoPlugin)
+enablePlugins(ScriptedPlugin)
+scriptedBufferLog := false
+scriptedLaunchOpts ++= Seq(
+  "-Xmx2048M",
+  s"-Dplugin.version=${version.value}"
+)
 
 def isCI = "true" == System.getenv("CI")

project/plugins.sbt

@@ -4,6 +4,8 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
 addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8-94-1cfdf0bd")
 
+libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
+
 Compile / unmanagedSourceDirectories +=
   (ThisBuild / baseDirectory).value.getParentFile /
     "src" / "main" / "scala"

src/main/scala/com/sourcegraph/sbtsourcegraph/SourcegraphEnable.scala

@@ -43,7 +43,7 @@ object SourcegraphEnable {
             javacOptions.in(p) += s"-Xplugin:semanticdb " +
               s"-build-tool:sbt " +
               s"-sourceroot:${baseDirectory.in(ThisBuild).value} " +
-              s"-targetroot:${classDirectory.in(Compile).value.toPath().resolveSibling("semanticdb-classes")}"
+              s"-targetroot:${classDirectory.in(p, Compile).value.toPath().resolveSibling("semanticdb-classes")}"
           ),
           overriddenScalaVersion.map(v => scalaVersion.in(p) := v),
           Option(SemanticdbPlugin.semanticdbEnabled.in(p) := true),

src/main/scala/com/sourcegraph/sbtsourcegraph/SourcegraphPlugin.scala

@@ -22,6 +22,14 @@ object SourcegraphPlugin extends AutoPlugin {
       taskKey[File](
         "Task to generate a single LSIF index for all SemanticDB files in this workspace."
       )
+    val sourcegraphTargetRoots: TaskKey[List[String]] =
+      taskKey[List[String]](
+        "Task to generate a single LSIF index for all SemanticDB files in this workspace."
+      )
+    val sourcegraphTargetRootsFile: TaskKey[File] =
+      taskKey[File](
+        "Task to generate a single LSIF index for all SemanticDB files in this workspace."
+      )
     val sourcegraphLsifJavaVersion: SettingKey[String] =
       settingKey[String]("The version of the `lsif-java` command-line tool.")
     val sourcegraphSemanticdbDirectories: TaskKey[List[File]] =
@@ -75,20 +83,36 @@ object SourcegraphPlugin extends AutoPlugin {
       scala.util.Properties
         .propOrElse("lsif-java-version", Versions.semanticdbJavacVersion())
     },
-    sourcegraphLsif := {
-      val out = target.in(Sourcegraph).value / "dump.lsif"
-      out.getParentFile.mkdirs()
+    sourcegraphTargetRoots := {
       val directories =
         sourcegraphSemanticdbDirectories.all(anyProjectFilter).value
       val directoryArguments = directories.iterator.flatten
         .map(_.getAbsolutePath())
         .toList
+        .distinct
       if (directoryArguments.isEmpty) {
         throw new TaskException(
           "Can't upload LSIF index to Sourcegraph because there are no SemanticDB directories. " +
             "To fix this problem, run the `sourcegraphEnable` command before `sourcegraphLsif` like this: sbt sourcegraphEnable sourcegraphLsif"
         )
       }
+      directoryArguments
+    },
+    sourcegraphTargetRootsFile := {
+      val roots = sourcegraphTargetRoots.value
+      val out = target.in(Sourcegraph).value / "targetroots.txt"
+      Files.createDirectories(out.toPath().getParent())
+      Files.write(
+        out.toPath(),
+        roots.asJava,
+        StandardOpenOption.CREATE,
+        StandardOpenOption.TRUNCATE_EXISTING
+      )
+      out
+    },
+    sourcegraphLsif := {
+      val out = target.in(Sourcegraph).value / "dump.lsif"
+      out.getParentFile.mkdirs()
       runProcess(
         sourcegraphCoursierBinary.value ::
           "launch" ::
@@ -97,7 +121,7 @@ object SourcegraphPlugin extends AutoPlugin {
           "--" ::
           "index-semanticdb" ::
           s"--output=$out" ::
-          directoryArguments
+          sourcegraphTargetRoots.value
       )
       out
     },
@@ -169,7 +193,7 @@ object SourcegraphPlugin extends AutoPlugin {
       val javacTargetroot = sourcegraphJavacTargetroot.value
       val jars = fullClasspath.result.value match {
         case Value(value) => value.map(_.data)
-        case _            => Nil
+        case other        => Nil
       }
       val results = List(
         javacTargetroot,
@@ -178,12 +202,14 @@ object SourcegraphPlugin extends AutoPlugin {
         .map(f => f / "META-INF" / "semanticdb")
         .filter(_.isDirectory())
       results.headOption.foreach { dir =>
-        Files.write(
-          dir.toPath.resolve("javacopts.txt"),
-          List("-classpath", jars.mkString(File.pathSeparator)).asJava,
-          StandardOpenOption.CREATE,
-          StandardOpenOption.TRUNCATE_EXISTING
-        )
+        if (jars.nonEmpty) {
+          Files.write(
+            dir.toPath.resolve("javacopts.txt"),
+            List("-classpath", jars.mkString(File.pathSeparator)).asJava,
+            StandardOpenOption.CREATE,
+            StandardOpenOption.TRUNCATE_EXISTING
+          )
+        }
       }
       results
     }

src/sbt-test/sbt-sourcegraph/basic/a/src/main/java/aj/A.java

@@ -0,0 +1,8 @@
+package aj;
+
+import geny.Generator;
+import org.junit.Assert;
+
+public class A {
+  public geny.Generator x = a.A.generator();
+}

src/sbt-test/sbt-sourcegraph/basic/a/src/main/scala/a/A.scala

@@ -0,0 +1,8 @@
+package a
+
+import org.junit.Assert
+
+object A extends App {
+  def generator = geny.Generator(1)
+  Assert.assertEquals(generator, "")
+}

src/sbt-test/sbt-sourcegraph/basic/b/src/test/java/bj/B.java

@@ -0,0 +1,5 @@
+package bj;
+
+public class B {
+	public geny.Generator generator = a.A.generator();
+}

src/sbt-test/sbt-sourcegraph/basic/build.sbt

@@ -0,0 +1,44 @@
+import scala.collection.JavaConverters._
+import java.nio.file.Paths
+import java.nio.file.Files
+
+inThisBuild(
+  List(
+    scalaVersion := "2.12.14",
+    organization := "com.example"
+  )
+)
+
+lazy val a = project
+  .settings(
+    libraryDependencies += "com.lihaoyi" %% "geny" % "0.6.10",
+    libraryDependencies += "junit" % "junit" % "4.13.2"
+  )
+
+lazy val b = project
+  .dependsOn(a)
+
+commands += Command.command("checkLsif") { s =>
+  val dumpPath =
+    (ThisBuild / baseDirectory).value / "target" / "sbt-sourcegraph" / "dump.lsif"
+  val dump = Files.readAllLines(dumpPath.toPath).asScala
+  val packageInformation =
+    """.*"name":"(.*)","manager":"jvm-dependencies"}""".r
+  val jvmDependencies = dump
+    .collect { case packageInformation(name) =>
+      name
+    }
+    .distinct
+    .sorted
+  if (
+    jvmDependencies != List(
+      "jdk",
+      "maven/com.lihaoyi/geny_2.12",
+      "maven/junit/junit",
+      "maven/org.scala-lang/scala-library"
+    )
+  ) {
+    sys.error(jvmDependencies.toString)
+  }
+  s
+}

src/sbt-test/sbt-sourcegraph/basic/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.5.2