AnnotationHandlers can now return a boolean to set if they actually handled the annotation or not (previously, the presumption was they always handled the annotation).

This is very useful for PrintAST on eclipse, because before this change, you'd never see method contents (as the initial dietParse would come first). Now Eclipse PrintASTHandler

will skip any non-full runs, and only print non-diet. It then returns true only if it printed.

1 files changed, 15 insertions, 10 deletions

diff --git a/src/lombok/eclipse/TransformEclipseAST.java b/src/lombok/eclipse/TransformEclipseAST.java
index f77639e1..b56c594a 100644
--- a/src/lombok/eclipse/TransformEclipseAST.java
+++ b/src/lombok/eclipse/TransformEclipseAST.java
@@ -115,32 +115,37 @@ public class TransformEclipseAST {
 	private static class AnnotationVisitor extends EclipseASTAdapter {
 		@Override public void visitAnnotationOnField(FieldDeclaration field, Node annotationNode, Annotation annotation) {
 			if ( annotationNode.isHandled() ) return;
-			handlers.handle((CompilationUnitDeclaration) annotationNode.top().get(), annotationNode, annotation);
-			annotationNode.setHandled();
+			CompilationUnitDeclaration top = (CompilationUnitDeclaration) annotationNode.top().get();
+			boolean handled = handlers.handle(top, annotationNode, annotation);
+			if ( handled ) annotationNode.setHandled();
 		}
 		
 		@Override public void visitAnnotationOnMethodArgument(Argument arg, AbstractMethodDeclaration method, Node annotationNode, Annotation annotation) {
 			if ( annotationNode.isHandled() ) return;
-			handlers.handle((CompilationUnitDeclaration) annotationNode.top().get(), annotationNode, annotation);
-			annotationNode.setHandled();
+			CompilationUnitDeclaration top = (CompilationUnitDeclaration) annotationNode.top().get();
+			boolean handled = handlers.handle(top, annotationNode, annotation);
+			if ( handled ) annotationNode.setHandled();
 		}
 		
 		@Override public void visitAnnotationOnLocal(LocalDeclaration local, Node annotationNode, Annotation annotation) {
 			if ( annotationNode.isHandled() ) return;
-			handlers.handle((CompilationUnitDeclaration) annotationNode.top().get(), annotationNode, annotation);
-			annotationNode.setHandled();
+			CompilationUnitDeclaration top = (CompilationUnitDeclaration) annotationNode.top().get();
+			boolean handled = handlers.handle(top, annotationNode, annotation);
+			if ( handled ) annotationNode.setHandled();
 		}
 		
 		@Override public void visitAnnotationOnMethod(AbstractMethodDeclaration method, Node annotationNode, Annotation annotation) {
 			if ( annotationNode.isHandled() ) return;
-			handlers.handle((CompilationUnitDeclaration) annotationNode.top().get(), annotationNode, annotation);
-			annotationNode.setHandled();
+			CompilationUnitDeclaration top = (CompilationUnitDeclaration) annotationNode.top().get();
+			boolean handled = handlers.handle(top, annotationNode, annotation);
+			if ( handled ) annotationNode.setHandled();
 		}
 		
 		@Override public void visitAnnotationOnType(TypeDeclaration type, Node annotationNode, Annotation annotation) {
 			if ( annotationNode.isHandled() ) return;
-			handlers.handle((CompilationUnitDeclaration) annotationNode.top().get(), annotationNode, annotation);
-			annotationNode.setHandled();
+			CompilationUnitDeclaration top = (CompilationUnitDeclaration) annotationNode.top().get();
+			boolean handled = handlers.handle(top, annotationNode, annotation);
+			if ( handled ) annotationNode.setHandled();
 		}
 	}
 }