Fix validator by walking elements ourselves (#93)

Author: LexManos

eventbus-test/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     testImplementation libs.junit.api
     testImplementation libs.jspecify.annotations
     testImplementation libs.compile.testing
+    testImplementation libs.auto.value
     testImplementation libs.jetbrains.annotations
     testRuntimeOnly libs.bundles.junit.runtime
 }

eventbus-validator/src/main/java/net/minecraftforge/eventbus/validator/EventBusValidator.java

@@ -4,10 +4,6 @@
  */
 package net.minecraftforge.eventbus.validator;
 
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.Trees;
-
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
@@ -17,40 +13,33 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
+
 import java.util.Set;
 
 public final class EventBusValidator extends AbstractValidator {
-    private Trees trees;
     private Types types;
 
     @Override
     public void init(ProcessingEnvironment processingEnv) {
         super.init(processingEnv);
-        trees = Trees.instance(processingEnv);
         types = processingEnv.getTypeUtils();
     }
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         for (var root : roundEnv.getRootElements()) {
-            var path = trees.getPath(root);
-            if (path != null) new BusFieldScanner().scan(path, null);
+            process(root);
         }
 
         return false; // allow other processors to run
     }
 
-    private final class BusFieldScanner extends TreePathScanner<Void, Void> {
-        @Override
-        public Void visitVariable(VariableTree varTree, Void ignored) {
-            Element element = trees.getElement(getCurrentPath());
-            if (element.getKind() != ElementKind.FIELD)
-                return super.visitVariable(varTree, ignored); // only interested in fields
-
+    private void process(Element element) {
+        if (element.getKind() == ElementKind.FIELD) {
             TypeMirror erasedFieldType = types.erasure(element.asType());
             var isStandardEventBus = types.isSameType(erasedFieldType, BusTypes.eventBus);
             if (!(isStandardEventBus || types.isSameType(erasedFieldType, BusTypes.cancellableEventBus)))
-                return super.visitVariable(varTree, ignored); // only interested in (Cancellable)EventBus fields
+                return; // only interested in (Cancellable)EventBus fields
 
             // Show a warning if the bus field is not final
             if (!element.getModifiers().contains(Modifier.FINAL)) {
@@ -73,8 +62,11 @@ public Void visitVariable(VariableTree varTree, Void ignored) {
                     );
                 }
             }
+        }
+
 
-            return super.visitVariable(varTree, ignored);
+        for (var child : element.getEnclosedElements()) {
+            process(child);
         }
     }
 }

settings.gradle

@@ -48,6 +48,7 @@ dependencyResolutionManagement {
         library 'jmh-annotationProcessor', 'org.openjdk.jmh', 'jmh-generator-annprocess' versionRef 'jmh'
 
         library 'compile-testing', 'com.google.testing.compile', 'compile-testing' version '0.21.0'
+        library 'auto-value', 'com.google.auto.value', 'auto-value' version '1.11.0' // Need to bump this because compile-testing uses an old non-module compatible version
         library 'jetbrains-annotations', 'org.jetbrains', 'annotations' version '26.0.2'
     }
     //@formatter:on