Added annotations as definitive children of nodes in our custom AST, and updated the visitor to call a separate visitAnnotationOnX method for annotated stuff. This way, 'handled' can be set per annotation.

Also fixed a bug in AST generation that caused StackOverflowErrors on most source files, and did some cosmetic renaming of parameters.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/lombok/eclipse/EclipseASTAdapter.java b/src/lombok/eclipse/EclipseASTAdapter.java
index 50fded89..d2e0050e 100644
--- a/src/lombok/eclipse/EclipseASTAdapter.java
+++ b/src/lombok/eclipse/EclipseASTAdapter.java
@@ -3,6 +3,7 @@ package lombok.eclipse;
 import lombok.eclipse.EclipseAST.Node;
 
 import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.Annotation;
 import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
 import org.eclipse.jdt.internal.compiler.ast.Initializer;
@@ -14,14 +15,18 @@ public abstract class EclipseASTAdapter implements EclipseASTVisitor {
 	@Override public void visitCompilationUnit(Node node, CompilationUnitDeclaration unit) {}
 	@Override public void endVisitCompilationUnit(Node node, CompilationUnitDeclaration unit) {}
 	@Override public void visitType(Node node, TypeDeclaration type) {}
+	@Override public void visitAnnotationOnType(Node node, TypeDeclaration type, Annotation annotation) {}
 	@Override public void endVisitType(Node node, TypeDeclaration type) {}
 	@Override public void visitInitializer(Node node, Initializer initializer) {}
 	@Override public void endVisitInitializer(Node node, Initializer initializer) {}
 	@Override public void visitField(Node node, FieldDeclaration field) {}
+	@Override public void visitAnnotationOnField(Node node, FieldDeclaration Field, Annotation annotation) {}
 	@Override public void endVisitField(Node node, FieldDeclaration field) {}
 	@Override public void visitMethod(Node node, AbstractMethodDeclaration method) {}
+	@Override public void visitAnnotationOnMethod(Node node, AbstractMethodDeclaration method, Annotation annotation) {}
 	@Override public void endVisitMethod(Node node, AbstractMethodDeclaration method) {}
 	@Override public void visitLocal(Node node, LocalDeclaration local) {}
+	@Override public void visitAnnotationOnLocal(Node node, LocalDeclaration local, Annotation annotation) {}
 	@Override public void endVisitLocal(Node node, LocalDeclaration local) {}
 	@Override public void visitStatement(Node node, Statement statement) {}
 	@Override public void endVisitStatement(Node node, Statement statement) {}