Fix duplicate data table entries.

A while ago we changed how search results work, which inadvertently led to duplicate results in data tables like this one.
tobli · Dec 12, 2024 · ceb3dab · ceb3dab
1 parent fdc042b
commit ceb3dab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/rewrite-java-test/src/test/java/org/openrewrite/java/search/FindTypesTest.java b/rewrite-java-test/src/test/java/org/openrewrite/java/search/FindTypesTest.java
@@ -47,6 +47,10 @@ public static void stat() {}
     @Test
     void simpleName() {
         rewriteRun(
+          spec -> spec.dataTable(TypeUses.Row.class, rows -> assertThat(rows)
+            .containsExactly(
+              new TypeUses.Row("B.java", "A1", "a.A1")
+            )),
           java(
             """
               import a.A1;

diff --git a/rewrite-java/src/main/java/org/openrewrite/java/search/FindTypes.java b/rewrite-java/src/main/java/org/openrewrite/java/search/FindTypes.java
@@ -206,11 +206,14 @@ public J visitFieldAccess(J.FieldAccess fieldAccess, ExecutionContext ctx) {
 
         private <J2 extends TypedTree> J2 found(J2 j, ExecutionContext ctx) {
             JavaType.FullyQualified fqn = TypeUtils.asFullyQualified(j.getType());
-            typeUses.insertRow(ctx, new TypeUses.Row(
-                    getCursor().firstEnclosingOrThrow(SourceFile.class).getSourcePath().toString(),
-                    j.printTrimmed(getCursor().getParentTreeCursor()),
-                    fqn == null ? j.getType().toString() : fqn.getFullyQualifiedName()
-            ));
+            if (!j.getMarkers().findFirst(SearchResult.class).isPresent()) {
+                // Avoid double-counting results in the data table
+                typeUses.insertRow(ctx, new TypeUses.Row(
+                        getCursor().firstEnclosingOrThrow(SourceFile.class).getSourcePath().toString(),
+                        j.printTrimmed(getCursor().getParentTreeCursor()),
+                        fqn == null ? j.getType().toString() : fqn.getFullyQualifiedName()
+                ));
+            }
             return SearchResult.found(j);
         }
     }