fix(java_indexer): add basic MarkedSource for wildcards (#5897)

kythe · Oct 13, 2023 · 3ca6473 · 3ca6473
1 parent 6c1aaf0
commit 3ca6473
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/kythe/java/com/google/devtools/kythe/analyzers/java/JavaEntrySets.java b/kythe/java/com/google/devtools/kythe/analyzers/java/JavaEntrySets.java
@@ -291,7 +291,13 @@ public EntrySet newWildcardNodeAndEmit(JCTree.JCWildcard wild, String sourcePath
     return emitAndReturn(
         newNode(NodeKind.TVAR)
             .addSignatureSalt(sourcePath + counter)
-            .setCorpusPath(defaultCorpusPath()));
+            .setCorpusPath(defaultCorpusPath())
+            .setProperty(
+                "code",
+                MarkedSource.newBuilder()
+                    .setKind(MarkedSource.Kind.IDENTIFIER)
+                    .setPreText("?")
+                    .build()));
   }
 
   /** Returns and emits a Java anchor for the given offset span. */

diff --git a/kythe/javatests/com/google/devtools/kythe/analyzers/java/testdata/pkg/RenderedCode.java b/kythe/javatests/com/google/devtools/kythe/analyzers/java/testdata/pkg/RenderedCode.java
@@ -2,6 +2,8 @@
 // - Package.code/rendered/signature "package pkg"
 package pkg;
 
+import java.util.List;
+
 // - @RenderedCode defines/binding RenderedCode
 // - RenderedCode.code/rendered/signature "public final class RenderedCode"
 // - RenderedCode.code/rendered/qualified_name "pkg.RenderedCode"
@@ -33,12 +35,35 @@ public static class Inner<T, U> {
     public static <A, B> Inner<A, B> create() {
       return null;
     }
+
+    // - @genericList defines/binding GenericList
+    // - GenericList.code/rendered/signature "List<T> genericList"
+    List<T> genericList;
   }
 
   // - @CONSTANT defines/binding Constant
   // - Constant.code/rendered/signature "public static final String CONSTANT"
   public static final String CONSTANT = "blah";
 
+  // - @arry defines/binding Arry
+  // - Arry.code/rendered/signature "private int[] arry"
+  private int[] arry;
+
+  // - @wildcardList defines/binding WildcardList
+  // - WildcardList.code/rendered/signature "List<?> wildcardList"
+  // - WildcardList typed WildcardListType
+  // - WildcardListType param.1 Wildcard
+  // - Wildcard.code/rendered/signature "?"
+  List<?> wildcardList;
+
+  // - @extendsBoundedList defines/binding ExtendsBoundedList
+  // - ExtendsBoundedList.code/rendered/signature "List<? extends RenderedCode> extendsBoundedList"
+  List<? extends RenderedCode> extendsBoundedList;
+
+  // - @superBoundedList defines/binding SuperBoundedList
+  // - SuperBoundedList.code/rendered/signature "List<? super Inner<?, ?>> superBoundedList"
+  List<? super Inner<?, ?>> superBoundedList;
+
   // - @E defines/binding E
   // - E.code/rendered/signature "protected enum E"
   protected enum E {