Drop dead CLI flags and simplify version/diagnostic helpers

Author: jupblb

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

@@ -4,7 +4,6 @@ import java.nio.charset.StandardCharsets
 import java.nio.file._
 
 import scala.collection.mutable.ListBuffer
-import scala.jdk.CollectionConverters._
 import scala.util.Properties
 import scala.util.Try
 
@@ -42,19 +41,16 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
    * error pointing at the two known causes.
    */
   private def reportMissingSemanticdbOutput(): Unit = {
-    val semanticdbFileCount = countSemanticdbFiles(targetroot)
-    if (semanticdbFileCount > 0)
+    if (containsFileWithSuffix(targetroot, ".semanticdb"))
       return
-    val classFileCount = countClassFiles(index.workingDirectory)
-    if (classFileCount == 0)
-      // Project has no compiled JVM output — nothing to index, stay quiet.
+    if (!containsFileWithSuffix(index.workingDirectory, ".class"))
+      // Project produced no compiled JVM output — nothing to index, stay quiet.
       return
     index
       .app
       .reporter
       .error(
-        s"""scip-java: Gradle finished successfully but produced no SemanticDB output.
-           |Compiled $classFileCount .class file(s); expected at least one .semanticdb file in $targetroot.
+        s"""scip-java: Gradle finished successfully but produced no SemanticDB output in $targetroot.
            |
            |This means our SemanticDB compiler plugin was not attached to one or more JavaCompile tasks. Two known causes:
            |
@@ -72,53 +68,17 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
       )
   }
 
-  private def countSemanticdbFiles(dir: Path): Long = {
-    if (!Files.isDirectory(dir))
-      return 0L
-    Try {
-      val stream = Files.walk(dir)
-      try stream
-        .filter(p =>
-          Files.isRegularFile(p) && p.getFileName.toString.endsWith(".semanticdb")
-        )
-        .count()
-      finally stream.close()
-    }.getOrElse(0L)
-  }
-
-  private def countClassFiles(workingDirectory: Path): Long = {
-    // Gradle places compiled classes under <project>/build/classes/**. Walk
-    // every `build/classes` directory we can find (top-level + immediate
-    // subprojects) and count `.class` files. Bounded so this stays cheap even
-    // on large multi-project builds.
-    val rootBuildClasses = workingDirectory.resolve("build").resolve("classes")
-    val subprojectBuildClasses = Try {
-      val stream = Files.list(workingDirectory)
-      try stream
-        .iterator()
-        .asScala
-        .filter(Files.isDirectory(_))
-        .map(_.resolve("build").resolve("classes"))
-        .toList
-      finally stream.close()
-    }.getOrElse(Nil)
-    (rootBuildClasses :: subprojectBuildClasses)
-      .filter(Files.isDirectory(_))
-      .iterator
-      .map(countClassFilesIn)
-      .sum
-  }
-
-  private def countClassFilesIn(dir: Path): Long =
-    Try {
-      val stream = Files.walk(dir)
-      try stream
-        .filter(p =>
-          Files.isRegularFile(p) && p.getFileName.toString.endsWith(".class")
-        )
-        .count()
+  private def containsFileWithSuffix(root: Path, suffix: String): Boolean =
+    Files.isDirectory(root) && Try {
+      val stream = Files.find(
+        root,
+        Integer.MAX_VALUE,
+        (p, attrs) =>
+          attrs.isRegularFile && p.getFileName.toString.endsWith(suffix)
+      )
+      try stream.findFirst().isPresent
       finally stream.close()
-    }.getOrElse(0L)
+    }.getOrElse(false)
 
   def targetroot: Path = index.finalTargetroot(defaultTargetroot)
 

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

@@ -44,7 +44,7 @@ class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) {
         index.workingDirectory,
         index.finalTargetroot(defaultTargetroot),
         tmp,
-        SystemJavaVersion.isAtLeast(SystemJavaVersion.detect(), "11")
+        SystemJavaVersion.detectMajor() >= 11
       )
       buildCommand ++=
         List(

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

@@ -2,20 +2,23 @@ package com.sourcegraph.scip_java.buildtools
 
 import java.nio.file.Files
 
-import scala.annotation.tailrec
-
 import com.sourcegraph.scip_java.Embedded
 
 object SystemJavaVersion {
-  // Returns the output of `System.getProperty("java.version")` from a fresh JVM
-  // instance using the system JVM installation. We can't use this process since
-  // it may be running on a separate JVM process (that's the case when we run
-  // `sbt test` in this build at least).
-  def detect(): String = {
+  // Returns the major version of the JVM that `java` on PATH resolves to. We
+  // can't just use `Properties.javaSpecVersion` because the current process
+  // may be a different JVM (e.g. when running `sbt test`).
+  //
+  // Examples:
+  //   "1.8.0_372" => 8   (Java 8 reports as "1.8.x")
+  //   "11.0.2"    => 11
+  //   "17.0.5"    => 17
+  def detectMajor(): Int = {
     val tmp = Files.createTempDirectory("java-version")
     val jar = Embedded.semanticdbJar(tmp)
     try {
-      os.proc(
+      val version = os
+        .proc(
           "java",
           "-cp",
           jar.toString(),
@@ -25,69 +28,12 @@ object SystemJavaVersion {
         .out
         .text()
         .trim()
+      if (version.startsWith("1."))
+        8
+      else
+        version.takeWhile(_.isDigit).toInt
     } finally {
       Files.deleteIfExists(jar)
     }
   }
-
-  // Copy-pasted from scala.util.Properties.isJavaAtLeast but makes the actual
-  // version a parameterizeable instead of being hard-coded to
-  // `Properties.javaVersionSpec`.
-  def isAtLeast(actualVersion: String, comparisonVersion: String): Boolean = {
-    def versionOf(s: String, depth: Int): (Int, String) =
-      s.indexOf('.') match {
-        case 0 =>
-          (-2, s.substring(1))
-        case 1 if depth == 0 && s.charAt(0) == '1' =>
-          val r0 = s.substring(2)
-          val (v, r) = versionOf(r0, 1)
-          val n =
-            if (v > 8 || r0.isEmpty)
-              -2
-            else
-              v // accept 1.8, not 1.9 or 1.
-          (n, r)
-        case -1 =>
-          val n =
-            if (!s.isEmpty)
-              s.toInt
-            else if (depth == 0)
-              -2
-            else
-              0
-          (n, "")
-        case i =>
-          val r = s.substring(i + 1)
-          val n =
-            if (depth < 2 && r.isEmpty)
-              -2
-            else
-              s.substring(0, i).toInt
-          (n, r)
-      }
-    @tailrec
-    def compareVersions(s: String, v: String, depth: Int): Int = {
-      if (depth >= 3)
-        0
-      else {
-        val (sn, srest) = versionOf(s, depth)
-        val (vn, vrest) = versionOf(v, depth)
-        if (vn < 0)
-          -2
-        else if (sn < vn)
-          -1
-        else if (sn > vn)
-          1
-        else
-          compareVersions(srest, vrest, depth + 1)
-      }
-    }
-
-    compareVersions(actualVersion, comparisonVersion, 0) match {
-      case -2 =>
-        throw new NumberFormatException(s"Not a version: $comparisonVersion")
-      case i =>
-        i >= 0
-    }
-  }
 }

scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexCommand.scala

@@ -34,14 +34,6 @@ case class IndexCommand(
         "For example, the default value for Gradle is 'build/semanticdb-targetroot' and for Maven it's 'target/semanticdb-targetroot'"
     )
     targetroot: Option[Path] = None,
-    @Description(
-      "Whether to enable the -verbose flag in the SemanticDB compiler plugin."
-    )
-    verbose: Boolean = false,
-    @Description(
-      "Whether to enable the -text:on flag in the SemanticDB compiler plugin."
-    )
-    text: Boolean = false,
     @Description(
       "Explicitly specify which build tool to use. " +
         "By default, the build tool is automatically detected. " +
@@ -125,17 +117,6 @@ case class IndexCommand(
       )
   }
 
-  def textFlag: String =
-    if (text)
-      "-text:on"
-    else
-      ""
-  def verboseFlag: String =
-    if (verbose)
-      "-verbose:on"
-    else
-      ""
-
   def workingDirectory: Path = AbsolutePath.of(app.env.workingDirectory)
   def finalTargetroot(default: Path): Path = AbsolutePath.of(
     targetroot.getOrElse(default),

scip-java/src/main/scala/com/sourcegraph/scip_java/commands/IndexSemanticdbCommand.scala

@@ -28,10 +28,6 @@ final case class IndexSemanticdbCommand(
     output: Path = Paths.get("index.scip"),
     @Description("Whether to process the SemanticDB files in parallel")
     parallel: Boolean = true,
-    @Description(
-      "Whether to infer the location of SemanticDB files based as produced by Bazel"
-    )
-    bazel: Boolean = true,
     @Description(
       "Whether to emit parent->child relationships for 'Find references' and 'Find implementations'. " +
         "This flag exists as a workaround for the issue https://github.com/sourcegraph/sourcegraph/issues/50927"

tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala

@@ -113,9 +113,6 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
           targetroot.toString
         ) ++ extraArguments
       val exit = app().run(arguments)
-      if (extraArguments.contains("--verbose")) {
-        println(app.capturedOutput)
-      }
       expectedError match {
         case Some(fn) =>
           assert(clue(exit) != 0, clues(app.capturedOutput))