Prune dead indexer code; drop ZINC/SBT URI scheme

Author: jupblb

build.sbt

@@ -555,10 +555,20 @@ lazy val minimizedSettings = List[Def.Setting[_]](
   (run / fork) := true,
   (Compile / unmanagedSourceDirectories) += minimizedSourceDirectory,
   libraryDependencies ++= List("org.projectlombok" % "lombok" % "1.18.22"),
+  // Fork javac so it receives real file paths instead of sbt's `vf://` virtual-file URIs
+  // (see the comment on `semanticdbKotlincMinimized` for the long story).
+  javaHome := Some(file(System.getProperty("java.home"))),
+  Compile / javacOptions ++=
+    Seq(
+      "-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+      "-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+      "-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+      "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+      "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    ),
   javacOptions +=
     List(
       s"-Xplugin:semanticdb",
-      s"-build-tool:sbt",
       s"-text:on",
       s"-verbose",
       s"-sourceroot:${(ThisBuild / baseDirectory).value}",

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

@@ -30,12 +30,6 @@ public enum CompilerRange {
    */
   FROM_POINT_TO_SYMBOL_NAME,
 
-  /**
-   * Map the compiler (point + 1) position to SemanticDB start and use (point + symbol name length +
-   * 1) for the SemanticDB end position.
-   */
-  FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE,
-
   /**
    * Use text search to find the start of the symbol name and use (found start + symbol name length)
    * for the SemanticDB end position.
@@ -46,18 +40,11 @@ public enum CompilerRange {
    * Use text search to find the start of the symbol name, using the point position as the starting
    * search offset and using (found start + symbol name length) for the SemanticDB end position.
    */
-  FROM_POINT_WITH_TEXT_SEARCH,
-
-  /**
-   * Use text search to find the start of the symbol name, searching from the end instead of the
-   * start.
-   */
-  FROM_END_WITH_TEXT_SEARCH;
+  FROM_POINT_WITH_TEXT_SEARCH;
 
   public boolean isFromPoint() {
     switch (this) {
       case FROM_POINT_TO_SYMBOL_NAME:
-      case FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE:
       case FROM_POINT_WITH_TEXT_SEARCH:
         return true;
       default:
@@ -66,36 +53,16 @@ public boolean isFromPoint() {
   }
 
   public boolean isFromEndPoint() {
-    switch (this) {
-      case FROM_END_TO_SYMBOL_NAME:
-      case FROM_END_WITH_TEXT_SEARCH:
-        return true;
-      default:
-        return false;
-    }
+    return this == FROM_END_TO_SYMBOL_NAME;
   }
 
   public boolean isFromTextSearch() {
     switch (this) {
       case FROM_TEXT_SEARCH:
-      case FROM_END_WITH_TEXT_SEARCH:
       case FROM_POINT_WITH_TEXT_SEARCH:
         return true;
       default:
         return false;
     }
   }
-
-  public boolean isPlusOne() {
-    switch (this) {
-      case FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE:
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  public boolean isFromEnd() {
-    return this == CompilerRange.FROM_END_WITH_TEXT_SEARCH;
-  }
 }

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

@@ -1,7 +1,6 @@
 package com.sourcegraph.semanticdb_javac;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.PackageElement;
@@ -36,12 +35,8 @@ public String semanticdbSymbol(Element sym, LocalSymbolsCache locals) {
     return result;
   }
 
-  public boolean isNone(Element sym) {
-    return sym == null;
-  }
-
   private String uncachedSemanticdbSymbol(Element sym, LocalSymbolsCache locals) {
-    if (isNone(sym)) return SemanticdbSymbols.ROOT_PACKAGE;
+    if (sym == null) return SemanticdbSymbols.ROOT_PACKAGE;
 
     if (sym instanceof PackageElement) {
       if (((PackageElement) sym).isUnnamed()) return SemanticdbSymbols.ROOT_PACKAGE;

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

@@ -2,7 +2,6 @@
 
 import javax.tools.Diagnostic;
 
-import javax.lang.model.element.Element;
 import java.util.Optional;
 
 public class RangeFinder {
@@ -16,81 +15,30 @@ public static class StartEndRange {
     }
   }
 
+  /**
+   * Searches {@code source} for {@code name} starting at {@code start}. If the name cannot be found
+   * and {@code fallback} is not {@link Diagnostic#NOPOS}, returns a range anchored at {@code
+   * fallback}; otherwise returns {@link Optional#empty()}.
+   */
   public static Optional<StartEndRange> findRange(
-      Element element,
-      String name,
-      int originalStartPos,
-      int originalEndPos,
-      String source,
-      boolean fromEnd) {
-    int startPos = findNameIn(name, originalStartPos, originalEndPos, element, source, fromEnd);
-    int endPos = startPos + name.length();
-
-    if (endPos == -1 || startPos == -1) {
-      return Optional.empty();
-    }
-
-    return Optional.of(new StartEndRange(startPos, endPos));
-  }
-
-  private static int findNameFromEnd(
-      String name,
-      int originalStartPos,
-      int originalEndPos,
-      int end,
-      Element element,
-      String source) {
-    if (end < 0) return -1;
-    int offset = source.lastIndexOf(name, end);
-    if (offset == -1 && originalStartPos != Diagnostic.NOPOS && originalEndPos != Diagnostic.NOPOS)
-      return originalStartPos;
-    if (offset == -1) {
-      return -1;
-    }
-    int endOfWord = offset + name.length();
-    // found name in wrong word? e.g. finding `"A"` in `A("A")`
-    if (offset > 0 && Character.isJavaIdentifierPart(source.charAt(offset - 1)))
-      return findNameFromEnd(name, originalStartPos, originalEndPos, offset - 1, element, source);
-    if (endOfWord < source.length() && Character.isJavaIdentifierPart(source.charAt(endOfWord)))
-      return findNameFromEnd(name, originalStartPos, originalEndPos, offset - 1, element, source);
-
-    return offset;
+      String name, int start, int fallback, String source) {
+    if (source.length() == 0) return Optional.empty();
+    int startPos = findNameFromStart(name, start, fallback, source);
+    if (startPos == -1) return Optional.empty();
+    return Optional.of(new StartEndRange(startPos, startPos + name.length()));
   }
 
-  private static int findNameFromStart(
-      String name,
-      int start,
-      int originalStartPos,
-      int originalEndPos,
-      Element element,
-      String source) {
+  private static int findNameFromStart(String name, int start, int fallback, String source) {
     if (start >= source.length()) return -1;
     int offset = source.indexOf(name, start);
-    if (offset == -1 && originalStartPos != Diagnostic.NOPOS && originalEndPos != Diagnostic.NOPOS)
-      return originalStartPos;
-    if (offset == -1) {
-      return -1;
-    }
+    if (offset == -1 && fallback != Diagnostic.NOPOS) return fallback;
+    if (offset == -1) return -1;
     int end = offset + name.length();
     // found name in wrong word? e.g. finding `"A"` in `A("A")`
     if (offset > 0 && Character.isJavaIdentifierPart(source.charAt(offset - 1)))
-      return findNameFromStart(name, end + 1, originalStartPos, originalEndPos, element, source);
+      return findNameFromStart(name, end + 1, fallback, source);
     if (end < source.length() && Character.isJavaIdentifierPart(source.charAt(end)))
-      return findNameFromStart(name, end + 1, originalStartPos, originalEndPos, element, source);
-
+      return findNameFromStart(name, end + 1, fallback, source);
     return offset;
   }
-
-  private static int findNameIn(
-      String name, int start, int end, Element element, String source, boolean fromEnd) {
-    if (source.length() == 0) return -1;
-
-    int offset;
-    if (fromEnd) offset = findNameFromEnd(name, start, start, end, element, source);
-    else offset = findNameFromStart(name, start, end, end, element, source);
-    if (offset > -1) {
-      return offset;
-    }
-    return -1;
-  }
 }

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

@@ -1,8 +1,6 @@
 package com.sourcegraph.semanticdb_javac;
 
 import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.function.Function;
 
 /**
  * A Java implementation of Rust's <code>Result[T, E]</code> type, or Scala's <code>Either[A, B]
@@ -17,7 +15,7 @@ private enum Kind {
     Error;
   }
 
-  private Kind kind;
+  private final Kind kind;
   private final T ok;
   private final E error;
 
@@ -31,69 +29,23 @@ private Result(Kind kind, T ok, E error) {
     this.ok = ok;
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    Result<?, ?> result = (Result<?, ?>) o;
-    return kind == result.kind
-        && Objects.equals(error, result.error)
-        && Objects.equals(ok, result.ok);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, error, ok);
-  }
-
-  @Override
-  public String toString() {
-    switch (kind) {
-      case Ok:
-        return "Error(" + error + ")";
-      case Error:
-        return "Ok(" + ok + ")";
-      default:
-        return "Result{" + "kind=" + kind + ", error=" + error + ", ok=" + ok + '}';
-    }
-  }
-
-  public <C> C fold(Function<T, C> onOk, Function<E, C> onError) {
-    switch (kind) {
-      case Ok:
-        return onOk.apply(ok);
-      case Error:
-        return onError.apply(error);
-      default:
-        throw new IllegalArgumentException(this.toString());
-    }
-  }
-
-  public <C> Result<C, E> map(Function<T, C> fn) {
-    return this.fold(left -> Result.ok(fn.apply(left)), Result::error);
-  }
-
   public boolean isOk() {
     return kind == Kind.Ok;
   }
 
-  public boolean isError() {
-    return kind == Kind.Error;
-  }
-
   public T getOrThrow() {
     if (kind == Kind.Ok) {
       return ok;
     } else {
-      throw new NoSuchElementException("no left value on " + this.toString());
+      throw new NoSuchElementException("no ok value on Result.Error(" + error + ")");
     }
   }
 
   public E getErrorOrThrow() {
     if (kind == Kind.Error) {
       return error;
     } else {
-      throw new NoSuchElementException("no left value on " + this.toString());
+      throw new NoSuchElementException("no error value on Result.Ok(" + ok + ")");
     }
   }
 

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

@@ -2,7 +2,6 @@
 
 import org.scip_code.scip.Document;
 import org.scip_code.scip.Index;
-import org.scip_code.scip.Occurrence;
 import org.scip_code.scip.Relationship;
 import org.scip_code.scip.SymbolInformation;
 

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

@@ -289,7 +289,7 @@ private static SymbolInformation.Kind scipKind(Element sym) {
   }
 
   // ===========================================
-  // Node resolution and traversal (unchanged from SemanticdbVisitor)
+  // Node resolution and traversal
   // ===========================================
 
   void resolveNodes() {
@@ -490,12 +490,11 @@ private Optional<ScipRange> scipRangeOf(Tree tree, CompilerRange kind, Element s
     SourcePositions sourcePositions = trees.getSourcePositions();
     int start = (int) sourcePositions.getStartPosition(compUnitTree, tree);
     int end = (int) sourcePositions.getEndPosition(compUnitTree, tree);
-    if (kind.isPlusOne()) start++;
 
     if (name != null) {
       if (kind.isFromTextSearch() && name.length() > 0) {
         Optional<RangeFinder.StartEndRange> startEndRange =
-            RangeFinder.findRange(sym, name, start, end, this.source, kind.isFromEnd());
+            RangeFinder.findRange(name, start, end, this.source);
         if (startEndRange.isPresent()) {
           start = startEndRange.get().start;
           end = startEndRange.get().end;