Prune dead indexer code; drop ZINC/SBT URI scheme

Author: jupblb

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/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

@@ -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

@@ -476,12 +476,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;

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

@@ -13,7 +13,6 @@
 import com.sun.source.util.JavacTask;
 
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
-import static javax.tools.StandardLocation.SOURCE_OUTPUT;
 
 /** Settings that can be configured alongside the -Xplugin compiler option. */
 public class SemanticdbJavacOptions {
@@ -29,7 +28,6 @@ public class SemanticdbJavacOptions {
   public boolean alreadyReportedErrors = false;
   public UriScheme uriScheme = UriScheme.DEFAULT;
   public NoRelativePathMode noRelativePath = NoRelativePathMode.INDEX_ANYWAY;
-  public Path generatedTargetRoot;
 
   public SemanticdbJavacOptions() {
     errors = new ArrayList<>();
@@ -53,7 +51,7 @@ public static SemanticdbJavacOptions parse(String[] args, JavacTask task) {
         String argValue = arg.substring("-targetroot:".length());
         if (argValue.equals(JAVAC_CLASSES_DIR_ARG)) {
           useJavacClassesDir = true;
-          result.targetroot = getJavacClassesDir(result, task).classes;
+          result.targetroot = getJavacClassesDir(result, task);
         } else {
           result.targetroot = Paths.get(argValue);
         }
@@ -83,9 +81,7 @@ public static SemanticdbJavacOptions parse(String[] args, JavacTask task) {
       } else if (arg.equals("-build-tool:bazel")) {
         result.uriScheme = UriScheme.BAZEL;
         useJavacClassesDir = true;
-        TargetPaths paths = getJavacClassesDir(result, task);
-        result.targetroot = paths.classes;
-        result.generatedTargetRoot = paths.sources;
+        result.targetroot = getJavacClassesDir(result, task);
       } else if (arg.equals("-text:on")) {
         result.includeText = true;
       } else if (arg.equals("-text:off")) {
@@ -128,28 +124,22 @@ private static boolean isSourcerootDefined(SemanticdbJavacOptions options) {
 
   // warning - use of internal API
   // requires --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
-  private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, JavacTask task) {
+  private static Path getJavacClassesDir(SemanticdbJavacOptions result, JavacTask task) {
     // both Context and BasicJavacTask are internal JDK classes so not exported
     // under >= JDK 17
     // com.sun.tools.javac.util.Context ctx =
     // ((com.sun.tools.javac.api.BasicJavacTask)
     // task).getContext();
     // I'm not aware of a better way to get the class output directory from javac
-    Path classOutputDir = null;
-    Path sourceOutputDir = null;
     try {
       Method getContext = task.getClass().getMethod("getContext");
       Object context = getContext.invoke(task);
       Method get = context.getClass().getMethod("get", Class.class);
       JavaFileManager fm = (JavaFileManager) get.invoke(context, JavaFileManager.class);
-      FileObject sourceOutputDirStub =
-          fm.getJavaFileForOutput(
-              SOURCE_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null);
-      FileObject clasSOutputDirStub =
+      FileObject classOutputDirStub =
           fm.getJavaFileForOutput(
               CLASS_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.CLASS, null);
-      classOutputDir = Paths.get(clasSOutputDirStub.toUri()).toAbsolutePath().getParent();
-      sourceOutputDir = Paths.get(sourceOutputDirStub.toUri()).toAbsolutePath().getParent();
+      return Paths.get(classOutputDirStub.toUri()).toAbsolutePath().getParent();
     } catch (Exception e) {
       ByteArrayOutputStream out = new ByteArrayOutputStream();
       e.printStackTrace(new PrintStream(out));
@@ -158,7 +148,7 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Jav
               "exception while processing SemanticDB option '-targetroot:%s'\n%s",
               JAVAC_CLASSES_DIR_ARG, out.toString());
       result.errors.add(errorMsg);
+      return null;
     }
-    return new TargetPaths(classOutputDir, sourceOutputDir);
   }
 }

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

@@ -43,17 +43,17 @@ class ScipTextDocumentBuilder(
     // synthetic accessors) do not produce duplicate entries.
     private val symbols = LinkedHashMap<String, SymbolInformation>()
 
-    fun build(): Document =
-        Document
-            .newBuilder()
-            .setRelativePath(relativePath)
-            .setLanguage(LANGUAGE_KOTLIN)
-            .addAllOccurrences(occurrences.values())
-            .addAllSymbols(symbols.values)
+    fun buildIndex(): Index =
+        Index.newBuilder()
+            .addDocuments(
+                Document.newBuilder()
+                    .setRelativePath(relativePath)
+                    .setLanguage(LANGUAGE_KOTLIN)
+                    .addAllOccurrences(occurrences.values())
+                    .addAllSymbols(symbols.values)
+                    .build())
             .build()
 
-    fun buildIndex(): Index = Index.newBuilder().addDocuments(build()).build()
-
     fun emitScipData(
         firBasedSymbol: FirBasedSymbol<*>?,
         symbol: Symbol,
@@ -284,8 +284,7 @@ class ScipTextDocumentBuilder(
                 else -> SymbolInformation.Kind.UnspecifiedKind
             }
 
-        // Mirrors the renderer used by SemanticdbTextDocumentBuilder for parity. We render the
-        // declaration as Kotlin source text — no markdown fence — and put it into
+        // Renders declarations as Kotlin source text — no markdown fence — and puts them into
         // SymbolInformation.signature_documentation.text.
         private val renderer: FirRenderer
             get() =

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

@@ -23,8 +23,6 @@ value class Symbol(private val symbol: String) {
     override fun toString(): String = symbol
 }
 
-fun String.symbol(): Symbol = Symbol(this)
-
 data class SemanticdbSymbolDescriptor(
     val kind: Kind,
     val name: String,

semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/ScipTextDocumentBuilder.kt

@@ -26,9 +26,8 @@ class SemanticdbVisitor(
     file: KtSourceFile,
     lineMap: LineMap,
     globals: GlobalSymbolsCache,
-    locals: LocalSymbolsCache = LocalSymbolsCache()
 ) {
-    private val cache = SymbolsCache(globals, locals)
+    private val cache = SymbolsCache(globals, LocalSymbolsCache())
     private val relativePath: String = computeRelativePath(sourceroot, file)
     private val scipBuilder = ScipTextDocumentBuilder(lineMap, cache, relativePath)