wip

Author: Strum355

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

@@ -15,9 +15,9 @@ public final class SemanticdbSignatures {
   private final GlobalSymbolsCache cache;
   private final LocalSymbolsCache locals;
 
-  private static final Semanticdb.Type UnresolvedTypeRef =
+  private static final Semanticdb.Type UNRESOLVED_TYPE_REF =
       Semanticdb.Type.newBuilder()
-          .setTypeRef(TypeRef.newBuilder().setSymbol("[unresolved]"))
+          .setTypeRef(TypeRef.newBuilder().setSymbol("unresolved_type#"))
           .build();
 
   public SemanticdbSignatures(GlobalSymbolsCache cache, LocalSymbolsCache locals) {
@@ -46,14 +46,14 @@ private Signature generateClassSignature(Symbol.ClassSymbol sym) {
     if (sym.getSuperclass() != Type.noType) {
       Semanticdb.Type superType = generateType(sym.getSuperclass());
       if (superType == null) {
-        superType = UnresolvedTypeRef;
+        superType = UNRESOLVED_TYPE_REF;
       }
       builder.addParents(superType);
     }
     for (Type iType : sym.getInterfaces()) {
       Semanticdb.Type type = generateType(iType);
       if (type == null) {
-        type = UnresolvedTypeRef;
+        type = UNRESOLVED_TYPE_REF;
       }
       builder.addParents(type);
     }
@@ -85,7 +85,7 @@ private Signature generateMethodSignature(Symbol.MethodSymbol sym) {
   private Signature generateFieldSignature(Symbol.VarSymbol sym) {
     Semanticdb.Type generateType = generateType(sym.type);
     if (generateType == null) {
-      generateType = UnresolvedTypeRef;
+      generateType = UNRESOLVED_TYPE_REF;
     }
     return Signature.newBuilder()
         .setValueSignature(ValueSignature.newBuilder().setTpe(generateType))
@@ -99,7 +99,7 @@ private Signature generateTypeSignature(Symbol.TypeVariableSymbol sym) {
 
     Semanticdb.Type upperBound = generateType(sym.type.getUpperBound());
     if (upperBound != null) builder.setUpperBound(upperBound);
-    else builder.setUpperBound(UnresolvedTypeRef);
+    else builder.setUpperBound(UNRESOLVED_TYPE_REF);
 
     return Signature.newBuilder().setTypeSignature(builder).build();
   }
@@ -137,7 +137,7 @@ public Semanticdb.Type visitDeclared(DeclaredType t, Void unused) {
       for (TypeMirror type : t.getTypeArguments()) {
         Semanticdb.Type visited = super.visit(type);
         if (visited == null) {
-          visited = UnresolvedTypeRef;
+          visited = UNRESOLVED_TYPE_REF;
         }
         typeParams.add(visited);
 
@@ -189,7 +189,7 @@ public Semanticdb.Type visitDeclared(DeclaredType t, Void unused) {
     public Semanticdb.Type visitArray(ArrayType t, Void unused) {
       Semanticdb.Type arrayComponentType = super.visit(t.getComponentType());
       if (arrayComponentType == null) {
-        arrayComponentType = UnresolvedTypeRef;
+        arrayComponentType = UNRESOLVED_TYPE_REF;
       }
       return Semanticdb.Type.newBuilder()
           .setTypeRef(

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

@@ -21,8 +21,6 @@
 import java.util.Iterator;
 import java.util.Optional;
 
-import static com.sourcegraph.semanticdb_javac.Debugging.pprint;
-
 /** Walks the AST of a typechecked compilation unit and generates a SemanticDB TextDocument. */
 public class SemanticdbVisitor extends TreePathScanner<Void, Void> {
 
@@ -56,7 +54,6 @@ public SemanticdbVisitor(
   }
 
   public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) {
-    pprint(semanticdbUri());
     this.scan(tree, null); // Trigger recursive AST traversal to collect SemanticDB information.
 
     return Semanticdb.TextDocument.newBuilder()