fix lsif snapshot diff with extra cheese

Author: Strum355

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

@@ -87,7 +87,11 @@ object SemanticdbPrinters {
       .append(
         symbols.get(occ.getSymbol) match {
           case Some(info) if occ.getRole == Role.DEFINITION =>
-            " " + new SignatureFormatter(info, symtab).formatSymbol() + ""
+            val sig = new SignatureFormatter(info, symtab).formatSymbol()
+            if (sig == "")
+              " " + info.getDisplayName
+            else
+              " " + sig + ""
           case _ =>
             ""
         }

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

@@ -28,6 +28,7 @@ import com.sourcegraph.lsif_protocol.LsifObject
 import com.sourcegraph.lsif_protocol.LsifPosition
 import com.sourcegraph.semanticdb_javac.Semanticdb
 import com.sourcegraph.semanticdb_javac.Semanticdb.Language
+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
@@ -119,6 +120,29 @@ object SnapshotLsifCommand {
           .setSymbol(symbol)
           .build()
         doc.addOccurrences(occ)
+
+        if (isDefinition) {
+          val hover =
+            (
+              for {
+                resultSetId <- lsif.next.get(o.getId)
+                hoverId <- lsif.hoverEdges.get(resultSetId)
+                hover <- lsif.hoverVertexes.get(hoverId)
+              } yield hover
+            ).get.getContentsList.asScala.map { h =>
+              println(h.getLanguage)
+              h
+            }.find { h => h.getLanguage != Language.UNKNOWN_LANGUAGE.toString.toLowerCase }.get.getValue
+          val symInfo = SymbolInformation
+            .newBuilder()
+            // we cheese it a bit here, as this is less work than trying to reconstruct
+            // a Signature from the pretty-printed Signature, with accompanying logic
+            // to fallback to display_name in SemanticdbPrinters.scala
+            .setDisplayName(hover)
+            .setSymbol(symbol)
+            .build()
+          doc.addSymbols(symInfo)
+        }
       }
     lsif.documents.values.map(_.build()).toList
   }

semanticdb-java/src/main/protobuf/semanticdb.proto

@@ -160,15 +160,16 @@ message Type {
   reserved 1, 3, 4, 5, 6, 11, 12, 15, 16;
   oneof sealed_value {
     TypeRef type_ref = 2;
-    IntersectionType intersection_type = 17;
     ExistentialType existential_type = 9;
+    IntersectionType intersection_type = 17;
   }
 }
 
 message TypeRef {
   string symbol = 2;
   repeated Type type_arguments = 3;
 }
+
 message IntersectionType {
   repeated Type types = 1;
 }