address review comments

Author: Strum355

lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala

@@ -4,7 +4,6 @@ import scala.jdk.CollectionConverters._
 
 import com.sourcegraph.lsif_semanticdb.SignatureFormatter
 import com.sourcegraph.lsif_semanticdb.Symtab
-import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role
 import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument
@@ -15,7 +14,6 @@ object SemanticdbPrinters {
       .getOccurrencesList
       .asScala
       .groupBy(_.getRange.getStartLine)
-    val symbolsmap = doc.getSymbolsList.asScala.map(s => s.getSymbol -> s).toMap
     val out = new StringBuilder()
     val symtab = new Symtab(doc)
     doc
@@ -24,7 +22,7 @@ object SemanticdbPrinters {
       .zipWithIndex
       .foreach { case (line, i) =>
         out.append(line.replace("\t", "→"))
-        val occurences = occurrencesByLine
+        val occurrences = occurrencesByLine
           .getOrElse(i, Nil)
           .sortBy(o =>
             (
@@ -33,8 +31,8 @@ object SemanticdbPrinters {
               o.getRange.getEndCharacter
             )
           )
-        occurences.foreach { occ =>
-          formatOccurrence(out, occ, line, symbolsmap, symtab)
+        occurrences.foreach { occ =>
+          formatOccurrence(out, occ, line, symtab)
         }
       }
     out.toString()
@@ -44,7 +42,6 @@ object SemanticdbPrinters {
       out: StringBuilder,
       occ: SymbolOccurrence,
       line: String,
-      symbols: Map[String, SymbolInformation],
       symtab: Symtab
   ): Unit = {
     val r = occ.getRange
@@ -85,13 +82,13 @@ object SemanticdbPrinters {
           ""
       )
       .append(
-        symbols.get(occ.getSymbol) match {
+        symtab.symbols.asScala.get(occ.getSymbol) match {
           case Some(info) if occ.getRole == Role.DEFINITION =>
             val sig = new SignatureFormatter(info, symtab).formatSymbol()
-            if (sig == "")
+            if (sig.isEmpty)
               " " + info.getDisplayName
             else
-              " " + sig + ""
+              " " + sig
           case _ =>
             ""
         }

lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala

@@ -125,18 +125,14 @@ object SnapshotLsifCommand {
           val hover =
             (
               for {
-                resultSetId <- lsif.next.get(o.getId)
-                hoverId <- lsif.hoverEdges.get(resultSetId)
-                hover <- lsif.hoverVertexes.get(hoverId)
-              } yield hover
-            ).get
-              .getContentsList
-              .asScala
-              .find { h =>
-                h.getLanguage != Language.UNKNOWN_LANGUAGE.toString.toLowerCase
-              }
-              .get
-              .getValue
+                resultSetId <- lsif.next.get(o.getId).toList
+                hoverId <- lsif.hoverEdges.get(resultSetId).toList
+                hover <- lsif.hoverVertexes.get(hoverId).toList
+                contents <- hover.getContentsList.asScala
+                if contents.getLanguage !=
+                  Language.UNKNOWN_LANGUAGE.toString.toLowerCase
+              } yield contents.getValue
+            ).mkString("\n")
           val symInfo = SymbolInformation
             .newBuilder()
             // we cheese it a bit here, as this is less work than trying to reconstruct

lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifWriter.java

@@ -93,7 +93,7 @@ public int emitDefinitionResult(int resultSet) {
     return definitionResult;
   }
 
-  public int emitHoverResult(MarkedString... markedStrings) {
+  public int emitHoverResult(MarkedString[] markedStrings) {
     return emitObject(
         lsifVertex("hoverResult")
             .setResult(

lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java

@@ -78,17 +78,18 @@ private void formatClassSignature(ClassSignature classSignature) {
               .collect(Collectors.joining(", ", "<", ">")));
     }
 
-    List<Type> parentsList =
+    List<Type> nonSyntheticParents =
         classSignature.getParentsList().stream()
             .filter(parent -> !parent.equals(OBJECT_TYPE_REF))
             .filter(parent -> !parent.getTypeRef().getSymbol().equals(ENUM_SYMBOL))
             .filter(parent -> !parent.getTypeRef().getSymbol().equals(ANNOTATION_SYMBOL))
             .collect(Collectors.toList());
     // TODO: extends vs implements
-    if (!parentsList.isEmpty()) {
+    if (!nonSyntheticParents.isEmpty()) {
       printKeyword(" extends");
 
-      String parents = parentsList.stream().map(this::formatType).collect(Collectors.joining(", "));
+      String parents =
+          nonSyntheticParents.stream().map(this::formatType).collect(Collectors.joining(", "));
       s.append(parents);
     }
   }
@@ -120,7 +121,7 @@ private void formatMethodSignature(MethodSignature methodSignature) {
         methodSignature.getParameterListsList().stream()
             .flatMap((params) -> getSymlinks(params).stream())
             .map(
-                (symInfo) ->
+                symInfo ->
                     formatType(symInfo.getSignature().getValueSignature().getTpe())
                         + " "
                         + symInfo.getDisplayName())

tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala

@@ -39,9 +39,9 @@ class SnapshotCommandSuite extends MopedSuite(LsifJava.app) {
          |
          |public class Sample {
          |//           ^^^^^^ definition main/Sample# public class Sample
-         |//           ^^^^^^ definition main/Sample#`<init>`(). public <init>()
+         |//           ^^^^^^ definition main/Sample#`<init>`(). public Sample()
          |   public static void main(String[] asdf) {}
-         |//                    ^^^^ definition main/Sample#main(). public static main(String[] asdf)
+         |//                    ^^^^ definition main/Sample#main(). public static void main(String[] asdf)
          |//                         ^^^^^^ reference java/lang/String#
          |//                                  ^^^^ definition local0 String[] asdf
          |}