Simplify codebase after LSIF removal

- Remove unused fields from ScipSemanticdbOptions: language, buildKind, format
- Remove unused methods from ScipOutputFormat: isTyped(), isNewlineDelimitedJSON()
- Remove unused imports from PackageTable: Iterator, Pattern
- Remove unused symbols field from ScipTextDocument
- Delete unused ScipProcessingException class
- Simplify ScipOutputStream to direct writes without concurrent buffering
- Update all call sites in IndexSemanticdbCommand, BazelBuildTool, BuildTool, ScipBuildTool

Author: jupblb

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

@@ -46,8 +46,7 @@ object BuildTool {
   def generateScipFromTargetroot(
       generateSemanticdbResult: CommandResult,
       targetroot: Path,
-      index: IndexCommand,
-      buildKind: String = ""
+      index: IndexCommand
   ): Int = {
     if (!Files.isDirectory(targetroot)) {
       generateSemanticdbResult.exitCode
@@ -62,7 +61,6 @@ object BuildTool {
           output = index.finalOutput,
           targetroot = List(targetroot),
           packagehub = index.packagehub,
-          buildKind = buildKind,
           app = index.app
         )
         .run()

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

@@ -105,8 +105,7 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
     BuildTool.generateScipFromTargetroot(
       generateSemanticdb(),
       index.finalTargetroot(defaultTargetroot),
-      index,
-      buildKind
+      index
     )
   }
 
@@ -117,7 +116,6 @@ class ScipBuildTool(index: IndexCommand) extends BuildTool("SCIP", index) {
       ScipBuildTool
         .ConfigFileNames
         .map(name => index.workingDirectory.resolve(name))
-  private def buildKind: String = parsedConfig.fold(_.kind, _ => "")
   private def generateSemanticdb(): CommandResult = {
     parsedConfig match {
       case ValueResult(value) =>

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

@@ -11,7 +11,6 @@ import com.sourcegraph.io.AbsolutePath
 import com.sourcegraph.scip_java.BuildInfo
 import com.sourcegraph.scip_java.buildtools.ClasspathEntry
 import com.sourcegraph.scip_semanticdb.ConsoleScipSemanticdbReporter
-import com.sourcegraph.scip_semanticdb.ScipOutputFormat
 import com.sourcegraph.scip_semanticdb.ScipSemanticdb
 import com.sourcegraph.scip_semanticdb.ScipSemanticdbOptions
 import moped.annotations._
@@ -47,8 +46,6 @@ final case class IndexSemanticdbCommand(
     @Description("Directories that contain SemanticDB files.")
     @PositionalArguments()
     targetroot: List[Path] = Nil,
-    @Description("The kind of this build, one of: empty string, jdk, maven")
-    buildKind: String = "",
     @Description(
       "If true, don't report an error when no documents have been indexed. " +
         "The resulting SCIP index will silently be empty instead."
@@ -74,15 +71,6 @@ final case class IndexSemanticdbCommand(
 
   def run(): Int = {
     val reporter = new ConsoleScipSemanticdbReporter(app)
-    val outputFilename = output.getFileName.toString
-    val format = ScipOutputFormat.fromFilename(outputFilename)
-    if (format == ScipOutputFormat.UNKNOWN) {
-      app.error(
-        s"unknown output format for filename '$outputFilename'. " +
-          s"Supported file extensions are `*.scip` and `*.scip.ndjson`"
-      )
-      return 1
-    }
     val packages =
       absoluteTargetroots
         .iterator
@@ -103,11 +91,8 @@ final case class IndexSemanticdbCommand(
           .setName("scip-java")
           .setVersion(BuildInfo.version)
           .build(),
-        "java",
-        format,
         parallel,
         packages.map(_.toPackageInformation).asJava,
-        buildKind,
         emitInverseRelationships,
         allowEmptyIndex,
         allowExportingGlobalSymbolsFromDirectoryEntries

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/BazelBuildTool.java

@@ -59,11 +59,8 @@ public boolean hasErrors() {
             options.sourceroot,
             reporter,
             Scip.ToolInfo.newBuilder().setName("scip-java").setVersion("HEAD").build(),
-            "java",
-            ScipOutputFormat.TYPED_PROTOBUF,
             options.parallel,
             mavenPackages,
-            /* buildKind */ "",
             /* emitInverseRelationships */ true,
             /* allowEmptyIndex */ true,
             /* indexDirectoryEntries */ false // because Bazel only compiles to jar files.

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/PackageTable.java

@@ -8,14 +8,11 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.regex.Pattern;
 
 public class PackageTable {
 

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputFormat.java

@@ -6,14 +6,6 @@ public enum ScipOutputFormat {
   TYPED_NDJSON,
   UNKNOWN;
 
-  public boolean isTyped() {
-    return this != UNKNOWN;
-  }
-
-  public boolean isNewlineDelimitedJSON() {
-    return this == TYPED_NDJSON;
-  }
-
   public static ScipOutputFormat fromFilename(String name) {
     if (name.endsWith(".scip")) return TYPED_PROTOBUF;
     if (name.endsWith(".scip.ndjson")) return TYPED_NDJSON;

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipOutputStream.java

@@ -2,35 +2,21 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Low-level methods to write raw SCIP bytes into the output stream. */
 public class ScipOutputStream {
   private final OutputStream out;
-  private final ConcurrentLinkedDeque<byte[]> buffer;
-  private final AtomicBoolean isFlushing;
 
   public ScipOutputStream(OutputStream out) {
     this.out = out;
-    this.buffer = new ConcurrentLinkedDeque<>();
-    this.isFlushing = new AtomicBoolean(false);
   }
 
-  public void write(byte[] bytes) {
+  public void write(byte[] bytes) throws IOException {
     if (bytes.length == 0) return;
-    buffer.add(bytes);
+    out.write(bytes);
   }
 
   public void flush() throws IOException {
-    if (isFlushing.compareAndSet(false, true)) {
-      byte[] bytes = buffer.poll();
-      while (bytes != null) {
-        out.write(bytes);
-        bytes = buffer.poll();
-      }
-      out.flush();
-      isFlushing.set(false);
-    }
+    out.flush();
   }
 }

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipProcessingException.java

@@ -12,11 +12,8 @@ public class ScipSemanticdbOptions {
   public final Path sourceroot;
   public final ScipSemanticdbReporter reporter;
   public final Scip.ToolInfo toolInfo;
-  public final String language;
-  public final ScipOutputFormat format;
   public final boolean parallel;
   public final List<MavenPackage> packages;
-  public final String buildKind;
   public final boolean emitInverseRelationships;
   public final boolean allowEmptyIndex;
   public final boolean allowExportingGlobalSymbolsFromDirectoryEntries;
@@ -27,11 +24,8 @@ public ScipSemanticdbOptions(
       Path sourceroot,
       ScipSemanticdbReporter reporter,
       Scip.ToolInfo toolInfo,
-      String language,
-      ScipOutputFormat format,
       boolean parallel,
       List<MavenPackage> packages,
-      String buildKind,
       boolean emitInverseRelationships,
       boolean allowEmptyIndex,
       boolean allowExportingGlobalSymbolsFromDirectoryEntries) {
@@ -40,11 +34,8 @@ public ScipSemanticdbOptions(
     this.sourceroot = sourceroot;
     this.reporter = reporter;
     this.toolInfo = toolInfo;
-    this.language = language;
-    this.format = format;
     this.parallel = parallel;
     this.packages = packages;
-    this.buildKind = buildKind;
     this.emitInverseRelationships = emitInverseRelationships;
     this.allowEmptyIndex = allowEmptyIndex;
     this.allowExportingGlobalSymbolsFromDirectoryEntries =

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdbOptions.java

@@ -10,7 +10,6 @@
 public class ScipTextDocument {
   public final Path semanticdbPath;
   public Semanticdb.TextDocument semanticdb;
-  public final Map<String, Semanticdb.SymbolInformation> symbols;
   // Map from symbols that have a definition occurrence to the list of symbols that have
   // `is_definition` relationships to that symbol.
   // This map is used to add `is_reference` relationships between all symbols in the list so that
@@ -23,7 +22,6 @@ public class ScipTextDocument {
   public ScipTextDocument(
       Path semanticdbPath, Semanticdb.TextDocument semanticdb, Path sourceroot) {
     this.semanticdbPath = semanticdbPath;
-    this.symbols = new HashMap<>();
     String uri = sourceroot.resolve(semanticdb.getUri()).toUri().toString();
     setSemanticdb(Semanticdb.TextDocument.newBuilder(semanticdb).setUri(uri).build());
   }
@@ -72,9 +70,6 @@ void visitIdTree(Semanticdb.IdTree tree) {
 
   private void setSemanticdb(Semanticdb.TextDocument semanticdb) {
     this.semanticdb = manifestOccurrencesForSyntheticSymbols(semanticdb);
-    for (Semanticdb.SymbolInformation info : semanticdb.getSymbolsList()) {
-      symbols.put(info.getSymbol(), info);
-    }
   }
 
   public Semanticdb.TextDocument manifestOccurrencesForSyntheticSymbols(