Fix for issue 308: Allows organize imports works with @Delegate Also fixes errors in eclipse-log when using @Delegate.

2 files changed, 984 insertions, 1 deletions

diff --git a/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
new file mode 100644
index 00000000..588efc1b
--- /dev/null
+++ b/src/core/lombok/eclipse/handlers/SetGeneratedByVisitor.java
@@ -0,0 +1,978 @@
+package lombok.eclipse.handlers;
+
+import static lombok.eclipse.handlers.EclipseHandlerUtil.setGeneratedBy;
+
+import org.eclipse.jdt.internal.compiler.ASTVisitor;
+import org.eclipse.jdt.internal.compiler.ast.AND_AND_Expression;
+import org.eclipse.jdt.internal.compiler.ast.ASTNode;
+import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.AllocationExpression;
+import org.eclipse.jdt.internal.compiler.ast.Annotation;
+import org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.Argument;
+import org.eclipse.jdt.internal.compiler.ast.ArrayAllocationExpression;
+import org.eclipse.jdt.internal.compiler.ast.ArrayInitializer;
+import org.eclipse.jdt.internal.compiler.ast.ArrayQualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.ArrayReference;
+import org.eclipse.jdt.internal.compiler.ast.ArrayTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.AssertStatement;
+import org.eclipse.jdt.internal.compiler.ast.Assignment;
+import org.eclipse.jdt.internal.compiler.ast.BinaryExpression;
+import org.eclipse.jdt.internal.compiler.ast.Block;
+import org.eclipse.jdt.internal.compiler.ast.BreakStatement;
+import org.eclipse.jdt.internal.compiler.ast.CaseStatement;
+import org.eclipse.jdt.internal.compiler.ast.CastExpression;
+import org.eclipse.jdt.internal.compiler.ast.CharLiteral;
+import org.eclipse.jdt.internal.compiler.ast.ClassLiteralAccess;
+import org.eclipse.jdt.internal.compiler.ast.Clinit;
+import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.CompoundAssignment;
+import org.eclipse.jdt.internal.compiler.ast.ConditionalExpression;
+import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.ContinueStatement;
+import org.eclipse.jdt.internal.compiler.ast.DoStatement;
+import org.eclipse.jdt.internal.compiler.ast.DoubleLiteral;
+import org.eclipse.jdt.internal.compiler.ast.EmptyStatement;
+import org.eclipse.jdt.internal.compiler.ast.EqualExpression;
+import org.eclipse.jdt.internal.compiler.ast.ExplicitConstructorCall;
+import org.eclipse.jdt.internal.compiler.ast.Expression;
+import org.eclipse.jdt.internal.compiler.ast.ExtendedStringLiteral;
+import org.eclipse.jdt.internal.compiler.ast.FalseLiteral;
+import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.FieldReference;
+import org.eclipse.jdt.internal.compiler.ast.FloatLiteral;
+import org.eclipse.jdt.internal.compiler.ast.ForStatement;
+import org.eclipse.jdt.internal.compiler.ast.ForeachStatement;
+import org.eclipse.jdt.internal.compiler.ast.IfStatement;
+import org.eclipse.jdt.internal.compiler.ast.ImportReference;
+import org.eclipse.jdt.internal.compiler.ast.Initializer;
+import org.eclipse.jdt.internal.compiler.ast.InstanceOfExpression;
+import org.eclipse.jdt.internal.compiler.ast.IntLiteral;
+import org.eclipse.jdt.internal.compiler.ast.Javadoc;
+import org.eclipse.jdt.internal.compiler.ast.JavadocAllocationExpression;
+import org.eclipse.jdt.internal.compiler.ast.JavadocArgumentExpression;
+import org.eclipse.jdt.internal.compiler.ast.JavadocArrayQualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocArraySingleTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocFieldReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocImplicitTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocMessageSend;
+import org.eclipse.jdt.internal.compiler.ast.JavadocQualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocReturnStatement;
+import org.eclipse.jdt.internal.compiler.ast.JavadocSingleNameReference;
+import org.eclipse.jdt.internal.compiler.ast.JavadocSingleTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.LabeledStatement;
+import org.eclipse.jdt.internal.compiler.ast.LocalDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.LongLiteral;
+import org.eclipse.jdt.internal.compiler.ast.MarkerAnnotation;
+import org.eclipse.jdt.internal.compiler.ast.MemberValuePair;
+import org.eclipse.jdt.internal.compiler.ast.MessageSend;
+import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.NormalAnnotation;
+import org.eclipse.jdt.internal.compiler.ast.NullLiteral;
+import org.eclipse.jdt.internal.compiler.ast.OR_OR_Expression;
+import org.eclipse.jdt.internal.compiler.ast.ParameterizedQualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.ParameterizedSingleTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.PostfixExpression;
+import org.eclipse.jdt.internal.compiler.ast.PrefixExpression;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedNameReference;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedSuperReference;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedThisReference;
+import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.ReturnStatement;
+import org.eclipse.jdt.internal.compiler.ast.SingleMemberAnnotation;
+import org.eclipse.jdt.internal.compiler.ast.SingleNameReference;
+import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference;
+import org.eclipse.jdt.internal.compiler.ast.StringLiteral;
+import org.eclipse.jdt.internal.compiler.ast.StringLiteralConcatenation;
+import org.eclipse.jdt.internal.compiler.ast.SuperReference;
+import org.eclipse.jdt.internal.compiler.ast.SwitchStatement;
+import org.eclipse.jdt.internal.compiler.ast.SynchronizedStatement;
+import org.eclipse.jdt.internal.compiler.ast.ThisReference;
+import org.eclipse.jdt.internal.compiler.ast.ThrowStatement;
+import org.eclipse.jdt.internal.compiler.ast.TrueLiteral;
+import org.eclipse.jdt.internal.compiler.ast.TryStatement;
+import org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.TypeParameter;
+import org.eclipse.jdt.internal.compiler.ast.UnaryExpression;
+import org.eclipse.jdt.internal.compiler.ast.WhileStatement;
+import org.eclipse.jdt.internal.compiler.ast.Wildcard;
+import org.eclipse.jdt.internal.compiler.lookup.BlockScope;
+import org.eclipse.jdt.internal.compiler.lookup.ClassScope;
+import org.eclipse.jdt.internal.compiler.lookup.CompilationUnitScope;
+import org.eclipse.jdt.internal.compiler.lookup.MethodScope;
+
+public final class SetGeneratedByVisitor extends ASTVisitor {
+	private final ASTNode source;
+	private final int newSourceStart;
+	private final int newSourceEnd;
+	
+	public SetGeneratedByVisitor(ASTNode source) {
+		this.source = source;
+		this.newSourceStart = this.source.sourceStart;
+		this.newSourceEnd = this.source.sourceEnd;
+	}
+	
+	private static void applyOffset(JavadocAllocationExpression node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.memberStart = newSourceStart;
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(JavadocMessageSend node, int newSourceStart, int newSourceEnd) {
+		applyOffsetMessageSend(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(JavadocSingleNameReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(JavadocSingleTypeReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+
+	private static void applyOffset(JavadocFieldReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetFieldReference(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(JavadocArrayQualifiedTypeReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(JavadocQualifiedTypeReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		node.tagSourceEnd = newSourceEnd;
+		node.tagSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(Annotation node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.declarationSourceEnd = newSourceEnd;
+	}
+
+	private static void applyOffset(ArrayTypeReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.originalSourceEnd = newSourceEnd;
+	}
+	
+	private static void applyOffset(AbstractMethodDeclaration node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.bodyEnd = newSourceEnd;
+		node.bodyStart = newSourceStart;
+		node.declarationSourceEnd = newSourceEnd;
+		node.declarationSourceStart = newSourceStart;
+		node.modifiersSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(Javadoc node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.valuePositions = newSourceStart;
+		for (int i = 0; i < node.inheritedPositions.length; i++) {
+			node.inheritedPositions[i] = recalcSourcePosition(node.inheritedPositions[i], newSourceStart, newSourceEnd);
+		}
+	}
+
+	private static void applyOffset(Initializer node, int newSourceStart, int newSourceEnd) {
+		applyOffsetFieldDeclaration(node, newSourceStart, newSourceEnd);
+		node.bodyStart = newSourceStart;
+		node.bodyEnd = newSourceEnd;
+	}
+
+	private static void applyOffset(TypeDeclaration node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.bodyEnd = newSourceEnd;
+		node.bodyStart = newSourceStart;
+		node.declarationSourceEnd = newSourceEnd;
+		node.declarationSourceStart = newSourceStart;
+		node.modifiersSourceStart = newSourceStart;
+	}
+	
+	private static void applyOffset(ImportReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.declarationEnd = newSourceEnd;
+		node.declarationSourceEnd = newSourceEnd;
+		node.declarationSourceStart = newSourceStart;
+		for (int i = 0; i < node.sourcePositions.length; i++) {
+			node.sourcePositions[i] = recalcSourcePosition(node.sourcePositions[i], newSourceStart, newSourceEnd);
+		}		
+	}
+
+	private static void applyOffsetASTNode(ASTNode node, int newSourceStart, int newSourceEnd) {
+		node.sourceEnd = newSourceEnd;
+		node.sourceStart = newSourceStart;
+	}
+
+	private static void applyOffsetExpression(Expression node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+//		if (node.statementEnd != -1) {
+			node.statementEnd = newSourceEnd;
+//		}
+	}
+
+	private static void applyOffsetVariable(AbstractVariableDeclaration node, int newSourceStart, int newSourceEnd) {
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.declarationEnd = newSourceEnd;
+		node.declarationSourceEnd = newSourceEnd;
+		node.declarationSourceStart = newSourceStart;
+		node.modifiersSourceStart = newSourceStart;
+	}
+		
+	private static void applyOffsetFieldDeclaration(FieldDeclaration node, int newSourceStart, int newSourceEnd) {
+		applyOffsetVariable(node, newSourceStart, newSourceEnd);
+		node.endPart1Position = newSourceEnd;
+		node.endPart2Position = newSourceEnd;
+	}
+
+	private static void applyOffsetFieldReference(FieldReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.nameSourcePosition = recalcSourcePosition(node.nameSourcePosition, newSourceStart, newSourceEnd);
+	}
+	
+	private static void applyOffsetMessageSend(MessageSend node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		node.nameSourcePosition = recalcSourcePosition(node.nameSourcePosition, newSourceStart, newSourceEnd);
+	}
+	
+	private static void applyOffsetQualifiedTypeReference(QualifiedTypeReference node, int newSourceStart, int newSourceEnd) {
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		for (int i = 0; i < node.sourcePositions.length; i++) {
+			node.sourcePositions[i] = recalcSourcePosition(node.sourcePositions[i], newSourceStart, newSourceEnd);
+		}
+	}
+
+	/** See {@link FieldReference#nameSourcePosition} for explanation 
+	 * @param newSourceEnd TODO*/ 
+	private static long recalcSourcePosition(long sourcePosition, int newSourceStart, int newSourceEnd) {
+		long start = (sourcePosition >>> 32);
+		long end = (sourcePosition & 0x00000000FFFFFFFFL);
+		start = newSourceStart;
+		end = newSourceStart;
+		return ((start<<32)+end); 
+	}
+	
+	@Override public boolean visit(AllocationExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+
+	@Override public boolean visit(AND_AND_Expression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(AnnotationMethodDeclaration node, ClassScope classScope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, classScope);
+	}
+
+	@Override public boolean visit(Argument node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetVariable(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+
+	@Override public boolean visit(Argument node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetVariable(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayAllocationExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayInitializer node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayQualifiedTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayQualifiedTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ArrayTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(AssertStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, this.newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+
+	@Override public boolean visit(Assignment node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(BinaryExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Block node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(BreakStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(CaseStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(CastExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(CharLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ClassLiteralAccess node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Clinit node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(CompilationUnitDeclaration node, CompilationUnitScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+
+	@Override public boolean visit(CompoundAssignment node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ConditionalExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ConstructorDeclaration node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ContinueStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(DoStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(DoubleLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(EmptyStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(EqualExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ExplicitConstructorCall node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ExtendedStringLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(FalseLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(FieldDeclaration node, MethodScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetFieldDeclaration(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(FieldReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetFieldReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(FieldReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetFieldReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(FloatLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ForeachStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ForStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(IfStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ImportReference node, CompilationUnitScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Initializer node, MethodScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(InstanceOfExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(IntLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Javadoc node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+
+	@Override public boolean visit(Javadoc node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocAllocationExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocAllocationExpression node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArgumentExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArgumentExpression node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArrayQualifiedTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArrayQualifiedTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArraySingleTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocArraySingleTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocFieldReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocFieldReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocImplicitTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocImplicitTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocMessageSend node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocMessageSend node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocQualifiedTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocQualifiedTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocReturnStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocReturnStatement node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocSingleNameReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocSingleNameReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocSingleTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(JavadocSingleTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(LabeledStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(LocalDeclaration node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetVariable(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(LongLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(MarkerAnnotation node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(MemberValuePair node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(MessageSend node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetMessageSend(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(MethodDeclaration node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(StringLiteralConcatenation node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(NormalAnnotation node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(NullLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(OR_OR_Expression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ParameterizedQualifiedTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ParameterizedQualifiedTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ParameterizedSingleTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ParameterizedSingleTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(PostfixExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(PrefixExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedAllocationExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedNameReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedNameReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedSuperReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedSuperReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedThisReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedThisReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(QualifiedTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetQualifiedTypeReference(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ReturnStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SingleMemberAnnotation node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SingleNameReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SingleNameReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SingleTypeReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SingleTypeReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(StringLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SuperReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SwitchStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		node.blockStart = newSourceStart;
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(SynchronizedStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ThisReference node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ThisReference node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(ThrowStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TrueLiteral node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TryStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TypeDeclaration node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TypeDeclaration node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TypeDeclaration node, CompilationUnitScope scope) {
+		setGeneratedBy(node, source);
+		applyOffset(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TypeParameter node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetVariable(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(TypeParameter node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetVariable(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(UnaryExpression node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(WhileStatement node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetASTNode(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Wildcard node, BlockScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+	
+	@Override public boolean visit(Wildcard node, ClassScope scope) {
+		setGeneratedBy(node, source);
+		applyOffsetExpression(node, newSourceStart, newSourceEnd);
+		return super.visit(node, scope);
+	}
+}
\ No newline at end of file
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java
index cc72c206..961d80d7 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchDelegate.java
@@ -38,6 +38,7 @@ import lombok.core.AST.Kind;
 import lombok.eclipse.EclipseAST;
 import lombok.eclipse.EclipseNode;
 import lombok.eclipse.TransformEclipseAST;
+import lombok.eclipse.handlers.SetGeneratedByVisitor;
 
 import org.eclipse.jdt.internal.compiler.CompilationResult;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
@@ -324,7 +325,11 @@ public class PatchDelegate {
 		for (BindingTuple pair : methods) {
 			EclipseNode annNode = typeNode.getAst().get(pair.responsible);
 			MethodDeclaration method = createDelegateMethod(pair.fieldName, typeNode, pair, top.compilationResult, annNode);
-			if (method != null) injectMethod(typeNode, method);
+			if (method != null) { 
+				SetGeneratedByVisitor visitor = new SetGeneratedByVisitor(annNode.get());
+				method.traverse(visitor, ((TypeDeclaration)typeNode.get()).scope);
+				injectMethod(typeNode, method);
+			}
 		}
 	}