Link references for fields, fixes #431

Previously, scip-java only linked references for method symbols. This
commit changes the behavior to additionally include fields so that "find
references" for fields shows usages of all implementations of the field
(abstract super field and concrete implementations).

Author: olafurpg

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.7.1

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

@@ -48,7 +48,9 @@ final case class IndexSemanticdbCommand(
 ) extends Command {
   def sourceroot: Path = AbsolutePath.of(app.env.workingDirectory)
   def absoluteTargetroots: List[Path] =
-    targetroot.map(AbsolutePath.of(_, app.env.workingDirectory))
+    if (targetroot.isEmpty) List(sourceroot)
+    else targetroot.map(AbsolutePath.of(_, sourceroot))
+
   def run(): Int = {
     val reporter = new ConsoleScipSemanticdbReporter(app)
     val outputFilename = output.getFileName.toString
@@ -68,7 +70,7 @@ final case class IndexSemanticdbCommand(
         .toList
     val options =
       new ScipSemanticdbOptions(
-        targetroot.map(ts => AbsolutePath.of(ts, sourceroot)).asJava,
+        absoluteTargetroots.asJava,
         AbsolutePath.of(output, sourceroot),
         sourceroot,
         reporter,

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

@@ -131,7 +131,7 @@ private void processTypedDocument(Path path, PackageTable packages) {
               Scip.Relationship.newBuilder()
                   .setSymbol(typedSymbol(overriddenSymbol, overriddenSymbolPkg))
                   .setIsImplementation(true)
-                  .setIsReference(SemanticdbSymbols.isMethod(info.getSymbol())));
+                  .setIsReference(SemanticdbSymbols.isMethodOrField(info.getSymbol())));
         }
         if (info.hasSignature()) {
           String language =
@@ -284,7 +284,7 @@ private Integer processDocumentUnsafe(
 
       // Overrides
       if (symbolInformation.getOverriddenSymbolsCount() > 0
-          && SemanticdbSymbols.isMethod(symbolInformation.getSymbol())
+          && SemanticdbSymbols.isMethodOrField(symbolInformation.getSymbol())
           && occ.getRole() == Role.DEFINITION) {
         List<Integer> overriddenReferenceResultIds =
             new ArrayList<>(symbolInformation.getOverriddenSymbolsCount());

semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSymbols.java

@@ -35,8 +35,8 @@ public static boolean isGlobal(String symbol) {
     return !isLocal(symbol);
   }
 
-  public static boolean isMethod(String symbol) {
-    return symbol.endsWith(").");
+  public static boolean isMethodOrField(String symbol) {
+    return symbol.endsWith(".");
   }
 
   /**

tests/minimized-scala/src/main/scala/minimized/Issue431.scala

@@ -0,0 +1,9 @@
+package minimized
+
+trait Issue431 {
+  val b: Int
+}
+
+class Issue431Subclass extends Issue431 {
+  override val b = 10
+}

tests/snapshots/src/main/generated/minimized/Issue431.scala

@@ -0,0 +1,18 @@
+package minimized
+//      ^^^^^^^^^ definition minimized/
+
+trait Issue431 {
+//    ^^^^^^^^ definition minimized/Issue431# trait Issue431
+  val b: Int
+//    ^ definition minimized/Issue431#b. val b: Int
+//       ^^^ reference scala/Int#
+}
+
+class Issue431Subclass extends Issue431 {
+//    ^^^^^^^^^^^^^^^^ definition minimized/Issue431Subclass# class Issue431Subclass
+//                      definition minimized/Issue431Subclass#`<init>`(). def this()
+//                             ^^^^^^^^ reference minimized/Issue431#
+//                                       reference java/lang/Object#`<init>`().
+  override val b = 10
+//             ^ definition minimized/Issue431Subclass#b. val b: Int
+}