80 files changed, 308 insertions, 0 deletions

diff --git a/src/lombok/AccessLevel.java b/src/core/lombok/AccessLevel.java
index 16edd108..16edd108 100644
--- a/src/lombok/AccessLevel.java
+++ b/src/core/lombok/AccessLevel.java
diff --git a/src/lombok/Cleanup.java b/src/core/lombok/Cleanup.java
index ce9e0aa9..ce9e0aa9 100644
--- a/src/lombok/Cleanup.java
+++ b/src/core/lombok/Cleanup.java
diff --git a/src/lombok/Data.java b/src/core/lombok/Data.java
index 488de640..488de640 100644
--- a/src/lombok/Data.java
+++ b/src/core/lombok/Data.java
diff --git a/src/lombok/EqualsAndHashCode.java b/src/core/lombok/EqualsAndHashCode.java
index 88d72051..88d72051 100644
--- a/src/lombok/EqualsAndHashCode.java
+++ b/src/core/lombok/EqualsAndHashCode.java
diff --git a/src/lombok/Getter.java b/src/core/lombok/Getter.java
index fa84954c..fa84954c 100644
--- a/src/lombok/Getter.java
+++ b/src/core/lombok/Getter.java
diff --git a/src/lombok/Lombok.java b/src/core/lombok/Lombok.java
index 71684f4f..71684f4f 100644
--- a/src/lombok/Lombok.java
+++ b/src/core/lombok/Lombok.java
diff --git a/src/lombok/NonNull.java b/src/core/lombok/NonNull.java
index 08eec2a5..08eec2a5 100644
--- a/src/lombok/NonNull.java
+++ b/src/core/lombok/NonNull.java
diff --git a/src/lombok/Setter.java b/src/core/lombok/Setter.java
index 778bb00d..778bb00d 100644
--- a/src/lombok/Setter.java
+++ b/src/core/lombok/Setter.java
diff --git a/src/lombok/SneakyThrows.java b/src/core/lombok/SneakyThrows.java
index 1feeadf1..1feeadf1 100644
--- a/src/lombok/SneakyThrows.java
+++ b/src/core/lombok/SneakyThrows.java
diff --git a/src/lombok/Synchronized.java b/src/core/lombok/Synchronized.java
index 72c44c71..72c44c71 100644
--- a/src/lombok/Synchronized.java
+++ b/src/core/lombok/Synchronized.java
diff --git a/src/lombok/ToString.java b/src/core/lombok/ToString.java
index 7b89d481..7b89d481 100644
--- a/src/lombok/ToString.java
+++ b/src/core/lombok/ToString.java
diff --git a/src/lombok/core/AST.java b/src/core/lombok/core/AST.java
index 6d786d1e..6d786d1e 100644
--- a/src/lombok/core/AST.java
+++ b/src/core/lombok/core/AST.java
diff --git a/src/lombok/core/AnnotationValues.java b/src/core/lombok/core/AnnotationValues.java
index 0408de85..0408de85 100644
--- a/src/lombok/core/AnnotationValues.java
+++ b/src/core/lombok/core/AnnotationValues.java
diff --git a/src/lombok/core/LombokNode.java b/src/core/lombok/core/LombokNode.java
index c8ee4c00..c8ee4c00 100644
--- a/src/lombok/core/LombokNode.java
+++ b/src/core/lombok/core/LombokNode.java
diff --git a/src/lombok/core/PrintAST.java b/src/core/lombok/core/PrintAST.java
index df1b652c..df1b652c 100644
--- a/src/lombok/core/PrintAST.java
+++ b/src/core/lombok/core/PrintAST.java
diff --git a/src/lombok/core/SpiLoadUtil.java b/src/core/lombok/core/SpiLoadUtil.java
index 0a97af7e..0a97af7e 100644
--- a/src/lombok/core/SpiLoadUtil.java
+++ b/src/core/lombok/core/SpiLoadUtil.java
diff --git a/src/lombok/core/TransformationsUtil.java b/src/core/lombok/core/TransformationsUtil.java
index 6b457927..6b457927 100644
--- a/src/lombok/core/TransformationsUtil.java
+++ b/src/core/lombok/core/TransformationsUtil.java
diff --git a/src/lombok/core/TypeLibrary.java b/src/core/lombok/core/TypeLibrary.java
index 5de01b70..5de01b70 100644
--- a/src/lombok/core/TypeLibrary.java
+++ b/src/core/lombok/core/TypeLibrary.java
diff --git a/src/lombok/core/TypeResolver.java b/src/core/lombok/core/TypeResolver.java
index dd1d9a53..dd1d9a53 100644
--- a/src/lombok/core/TypeResolver.java
+++ b/src/core/lombok/core/TypeResolver.java
diff --git a/src/lombok/core/Version.java b/src/core/lombok/core/Version.java
index 37944218..37944218 100644
--- a/src/lombok/core/Version.java
+++ b/src/core/lombok/core/Version.java
diff --git a/src/lombok/core/package-info.java b/src/core/lombok/core/package-info.java
index 0dc5225c..0dc5225c 100644
--- a/src/lombok/core/package-info.java
+++ b/src/core/lombok/core/package-info.java
diff --git a/src/lombok/eclipse/Eclipse.java b/src/core/lombok/eclipse/Eclipse.java
index 41d9300f..41d9300f 100644
--- a/src/lombok/eclipse/Eclipse.java
+++ b/src/core/lombok/eclipse/Eclipse.java
diff --git a/src/lombok/eclipse/EclipseAST.java b/src/core/lombok/eclipse/EclipseAST.java
index e42e5de2..e42e5de2 100644
--- a/src/lombok/eclipse/EclipseAST.java
+++ b/src/core/lombok/eclipse/EclipseAST.java
diff --git a/src/lombok/eclipse/EclipseASTAdapter.java b/src/core/lombok/eclipse/EclipseASTAdapter.java
index 2062619c..2062619c 100644
--- a/src/lombok/eclipse/EclipseASTAdapter.java
+++ b/src/core/lombok/eclipse/EclipseASTAdapter.java
diff --git a/src/lombok/eclipse/EclipseASTVisitor.java b/src/core/lombok/eclipse/EclipseASTVisitor.java
index 793166d7..793166d7 100644
--- a/src/lombok/eclipse/EclipseASTVisitor.java
+++ b/src/core/lombok/eclipse/EclipseASTVisitor.java
diff --git a/src/lombok/eclipse/EclipseAnnotationHandler.java b/src/core/lombok/eclipse/EclipseAnnotationHandler.java
index aaa57603..aaa57603 100644
--- a/src/lombok/eclipse/EclipseAnnotationHandler.java
+++ b/src/core/lombok/eclipse/EclipseAnnotationHandler.java
diff --git a/src/lombok/eclipse/EclipseNode.java b/src/core/lombok/eclipse/EclipseNode.java
index 668e6a6e..668e6a6e 100644
--- a/src/lombok/eclipse/EclipseNode.java
+++ b/src/core/lombok/eclipse/EclipseNode.java
diff --git a/src/lombok/eclipse/HandlerLibrary.java b/src/core/lombok/eclipse/HandlerLibrary.java
index 36c41504..36c41504 100644
--- a/src/lombok/eclipse/HandlerLibrary.java
+++ b/src/core/lombok/eclipse/HandlerLibrary.java
diff --git a/src/lombok/eclipse/TransformEclipseAST.java b/src/core/lombok/eclipse/TransformEclipseAST.java
index 3b5482ca..3b5482ca 100644
--- a/src/lombok/eclipse/TransformEclipseAST.java
+++ b/src/core/lombok/eclipse/TransformEclipseAST.java
diff --git a/src/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index 2f676d09..2f676d09 100644
--- a/src/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
diff --git a/src/lombok/eclipse/handlers/HandleCleanup.java b/src/core/lombok/eclipse/handlers/HandleCleanup.java
index d296e96b..d296e96b 100644
--- a/src/lombok/eclipse/handlers/HandleCleanup.java
+++ b/src/core/lombok/eclipse/handlers/HandleCleanup.java
diff --git a/src/lombok/eclipse/handlers/HandleData.java b/src/core/lombok/eclipse/handlers/HandleData.java
index 8c4e07ce..8c4e07ce 100644
--- a/src/lombok/eclipse/handlers/HandleData.java
+++ b/src/core/lombok/eclipse/handlers/HandleData.java
diff --git a/src/lombok/eclipse/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
index 7c0980c8..7c0980c8 100644
--- a/src/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/eclipse/handlers/HandleEqualsAndHashCode.java
diff --git a/src/lombok/eclipse/handlers/HandleGetter.java b/src/core/lombok/eclipse/handlers/HandleGetter.java
index 4a9930e3..4a9930e3 100644
--- a/src/lombok/eclipse/handlers/HandleGetter.java
+++ b/src/core/lombok/eclipse/handlers/HandleGetter.java
diff --git a/src/lombok/eclipse/handlers/HandlePrintAST.java b/src/core/lombok/eclipse/handlers/HandlePrintAST.java
index 580a54a2..580a54a2 100644
--- a/src/lombok/eclipse/handlers/HandlePrintAST.java
+++ b/src/core/lombok/eclipse/handlers/HandlePrintAST.java
diff --git a/src/lombok/eclipse/handlers/HandleSetter.java b/src/core/lombok/eclipse/handlers/HandleSetter.java
index 9bd10af3..9bd10af3 100644
--- a/src/lombok/eclipse/handlers/HandleSetter.java
+++ b/src/core/lombok/eclipse/handlers/HandleSetter.java
diff --git a/src/lombok/eclipse/handlers/HandleSneakyThrows.java b/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java
index 38f22b2a..38f22b2a 100644
--- a/src/lombok/eclipse/handlers/HandleSneakyThrows.java
+++ b/src/core/lombok/eclipse/handlers/HandleSneakyThrows.java
diff --git a/src/lombok/eclipse/handlers/HandleSynchronized.java b/src/core/lombok/eclipse/handlers/HandleSynchronized.java
index fde36192..fde36192 100644
--- a/src/lombok/eclipse/handlers/HandleSynchronized.java
+++ b/src/core/lombok/eclipse/handlers/HandleSynchronized.java
diff --git a/src/lombok/eclipse/handlers/HandleToString.java b/src/core/lombok/eclipse/handlers/HandleToString.java
index d5a4c398..d5a4c398 100644
--- a/src/lombok/eclipse/handlers/HandleToString.java
+++ b/src/core/lombok/eclipse/handlers/HandleToString.java
diff --git a/src/lombok/eclipse/handlers/package-info.java b/src/core/lombok/eclipse/handlers/package-info.java
index 062b73b3..062b73b3 100644
--- a/src/lombok/eclipse/handlers/package-info.java
+++ b/src/core/lombok/eclipse/handlers/package-info.java
diff --git a/src/lombok/eclipse/package-info.java b/src/core/lombok/eclipse/package-info.java
index 0b5add4c..0b5add4c 100644
--- a/src/lombok/eclipse/package-info.java
+++ b/src/core/lombok/eclipse/package-info.java
diff --git a/src/lombok/javac/HandlerLibrary.java b/src/core/lombok/javac/HandlerLibrary.java
index bbe9dec0..bbe9dec0 100644
--- a/src/lombok/javac/HandlerLibrary.java
+++ b/src/core/lombok/javac/HandlerLibrary.java
diff --git a/src/lombok/javac/Javac.java b/src/core/lombok/javac/Javac.java
index 58a24207..58a24207 100644
--- a/src/lombok/javac/Javac.java
+++ b/src/core/lombok/javac/Javac.java
diff --git a/src/lombok/javac/JavacAST.java b/src/core/lombok/javac/JavacAST.java
index f2c83fb8..f2c83fb8 100644
--- a/src/lombok/javac/JavacAST.java
+++ b/src/core/lombok/javac/JavacAST.java
diff --git a/src/lombok/javac/JavacASTAdapter.java b/src/core/lombok/javac/JavacASTAdapter.java
index 41bc46d3..41bc46d3 100644
--- a/src/lombok/javac/JavacASTAdapter.java
+++ b/src/core/lombok/javac/JavacASTAdapter.java
diff --git a/src/lombok/javac/JavacASTVisitor.java b/src/core/lombok/javac/JavacASTVisitor.java
index 3c5887a7..3c5887a7 100644
--- a/src/lombok/javac/JavacASTVisitor.java
+++ b/src/core/lombok/javac/JavacASTVisitor.java
diff --git a/src/lombok/javac/JavacAnnotationHandler.java b/src/core/lombok/javac/JavacAnnotationHandler.java
index 5b6fe4ce..5b6fe4ce 100644
--- a/src/lombok/javac/JavacAnnotationHandler.java
+++ b/src/core/lombok/javac/JavacAnnotationHandler.java
diff --git a/src/lombok/javac/JavacNode.java b/src/core/lombok/javac/JavacNode.java
index a0ee2789..a0ee2789 100644
--- a/src/lombok/javac/JavacNode.java
+++ b/src/core/lombok/javac/JavacNode.java
diff --git a/src/lombok/javac/apt/Processor.java b/src/core/lombok/javac/apt/Processor.java
index 9c851762..9c851762 100644
--- a/src/lombok/javac/apt/Processor.java
+++ b/src/core/lombok/javac/apt/Processor.java
diff --git a/src/lombok/javac/apt/package-info.java b/src/core/lombok/javac/apt/package-info.java
index 0c47c40f..0c47c40f 100644
--- a/src/lombok/javac/apt/package-info.java
+++ b/src/core/lombok/javac/apt/package-info.java
diff --git a/src/lombok/javac/handlers/HandleCleanup.java b/src/core/lombok/javac/handlers/HandleCleanup.java
index 88a8e1d7..88a8e1d7 100644
--- a/src/lombok/javac/handlers/HandleCleanup.java
+++ b/src/core/lombok/javac/handlers/HandleCleanup.java
diff --git a/src/lombok/javac/handlers/HandleData.java b/src/core/lombok/javac/handlers/HandleData.java
index eef7f78d..eef7f78d 100644
--- a/src/lombok/javac/handlers/HandleData.java
+++ b/src/core/lombok/javac/handlers/HandleData.java
diff --git a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
index 61a4ef63..61a4ef63 100644
--- a/src/lombok/javac/handlers/HandleEqualsAndHashCode.java
+++ b/src/core/lombok/javac/handlers/HandleEqualsAndHashCode.java
diff --git a/src/lombok/javac/handlers/HandleGetter.java b/src/core/lombok/javac/handlers/HandleGetter.java
index e60e426d..e60e426d 100644
--- a/src/lombok/javac/handlers/HandleGetter.java
+++ b/src/core/lombok/javac/handlers/HandleGetter.java
diff --git a/src/lombok/javac/handlers/HandlePrintAST.java b/src/core/lombok/javac/handlers/HandlePrintAST.java
index 4c25694b..4c25694b 100644
--- a/src/lombok/javac/handlers/HandlePrintAST.java
+++ b/src/core/lombok/javac/handlers/HandlePrintAST.java
diff --git a/src/lombok/javac/handlers/HandleSetter.java b/src/core/lombok/javac/handlers/HandleSetter.java
index 84032e9c..84032e9c 100644
--- a/src/lombok/javac/handlers/HandleSetter.java
+++ b/src/core/lombok/javac/handlers/HandleSetter.java
diff --git a/src/lombok/javac/handlers/HandleSneakyThrows.java b/src/core/lombok/javac/handlers/HandleSneakyThrows.java
index e7879dd1..e7879dd1 100644
--- a/src/lombok/javac/handlers/HandleSneakyThrows.java
+++ b/src/core/lombok/javac/handlers/HandleSneakyThrows.java
diff --git a/src/lombok/javac/handlers/HandleSynchronized.java b/src/core/lombok/javac/handlers/HandleSynchronized.java
index c86d99c6..c86d99c6 100644
--- a/src/lombok/javac/handlers/HandleSynchronized.java
+++ b/src/core/lombok/javac/handlers/HandleSynchronized.java
diff --git a/src/lombok/javac/handlers/HandleToString.java b/src/core/lombok/javac/handlers/HandleToString.java
index f7251ab8..f7251ab8 100644
--- a/src/lombok/javac/handlers/HandleToString.java
+++ b/src/core/lombok/javac/handlers/HandleToString.java
diff --git a/src/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 34d8b849..34d8b849 100644
--- a/src/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
diff --git a/src/lombok/javac/handlers/package-info.java b/src/core/lombok/javac/handlers/package-info.java
index b08d6af3..b08d6af3 100644
--- a/src/lombok/javac/handlers/package-info.java
+++ b/src/core/lombok/javac/handlers/package-info.java
diff --git a/src/lombok/javac/package-info.java b/src/core/lombok/javac/package-info.java
index 0df2f050..0df2f050 100644
--- a/src/lombok/javac/package-info.java
+++ b/src/core/lombok/javac/package-info.java
diff --git a/src/lombok/package-info.java b/src/core/lombok/package-info.java
index 6d5af3d1..6d5af3d1 100644
--- a/src/lombok/package-info.java
+++ b/src/core/lombok/package-info.java
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
new file mode 100644
index 00000000..7d2a28bc
--- /dev/null
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package lombok.eclipse.agent;
+
+import java.lang.instrument.Instrumentation;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import lombok.patcher.Hook;
+import lombok.patcher.MethodTarget;
+import lombok.patcher.ScriptManager;
+import lombok.patcher.StackRequest;
+import lombok.patcher.TargetMatcher;
+import lombok.patcher.equinox.EquinoxClassLoader;
+import lombok.patcher.scripts.ScriptBuilder;
+
+/**
+ * This is a java-agent that patches some of eclipse's classes so AST Nodes are handed off to Lombok
+ * for modification before Eclipse actually uses them to compile, render errors, show code outlines,
+ * create auto-completion dialogs, and anything else eclipse does with java code. See the *Transformer
+ * classes in this package for more information about which classes are transformed and how they are
+ * transformed.
+ */
+public class EclipsePatcher {
+	private EclipsePatcher() {}
+	
+	public static void agentmain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception {
+		registerPatchScripts(instrumentation, true);
+	}
+	
+	public static void premain(@SuppressWarnings("unused") String agentArgs, Instrumentation instrumentation) throws Exception {
+		registerPatchScripts(instrumentation, false);
+	}
+	
+	private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses) {
+		ScriptManager sm = new ScriptManager();
+		sm.registerTransformer(instrumentation);
+		EquinoxClassLoader.addPrefix("lombok.");
+		EquinoxClassLoader.registerScripts(sm);
+		
+		patchLombokizeAST(sm);
+		patchAvoidReparsingGeneratedCode(sm);
+		patchCatchReparse(sm);
+		patchSetGeneratedFlag(sm);
+		patchHideGeneratedNodes(sm);
+		
+		if (reloadExistingClasses) sm.reloadClasses(instrumentation);
+	}
+	
+	private static void patchHideGeneratedNodes(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.wrapReturnValue()
+				.target(new MethodTarget("org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder", "findByNode"))
+				.target(new MethodTarget("org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder", "findByBinding"))
+				.wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "removeGeneratedSimpleNames",
+						"([Lorg/eclipse/jdt/core/dom/SimpleName;)[Lorg/eclipse/jdt/core/dom/SimpleName;"))
+				.request(StackRequest.RETURN_VALUE).build());
+		
+		patchRefactorScripts(sm);
+		patchFormatters(sm);
+	}
+	
+	private static void patchFormatters(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.setSymbolDuringMethodCall()
+				.target(new MethodTarget("org.eclipse.jdt.internal.ui.text.java.JavaFormattingStrategy", "format", "void"))
+				.callToWrap(new Hook("org/eclipse/jdt/internal/corext/util/CodeFormatterUtil", "reformat",
+						"(ILjava/lang/String;IIILjava/lang/String;Ljava/util/Map;)Lorg/eclipse/text/edits/TextEdit;"))
+				.symbol("lombok.disable").build());
+	}
+	
+	private static void patchRefactorScripts(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.exitEarly()
+				.target(new MethodTarget("org.eclipse.jdt.core.dom.rewrite.ASTRewrite", "replace"))
+				.target(new MethodTarget("org.eclipse.jdt.core.dom.rewrite.ASTRewrite", "remove"))
+				.decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "skipRewritingGeneratedNodes",
+						"(Lorg/eclipse/jdt/core/dom/ASTNode;)Z"))
+				.transplant().request(StackRequest.PARAM1).build());
+		
+		sm.addScript(ScriptBuilder.wrapMethodCall()
+				.target(new MethodTarget("org.eclipse.jdt.internal.corext.refactoring.rename.RenameTypeProcessor", "addConstructorRenames"))
+				.methodToWrap(new Hook("org/eclipse/jdt/core/IType", "getMethods", "()[Lorg/eclipse/jdt/core/IMethod;"))
+				.wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "removeGeneratedMethods", 
+						"([Lorg/eclipse/jdt/core/IMethod;)[Lorg/eclipse/jdt/core/IMethod;"))
+				.transplant().build());
+	}
+	
+	private static void patchCatchReparse(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.wrapReturnValue()
+				.target(new MethodTarget("org.eclipse.jdt.core.dom.ASTConverter", "retrieveStartingCatchPosition"))
+				.wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "fixRetrieveStartingCatchPosition", "(I)I"))
+				.transplant().request(StackRequest.PARAM1).build());
+	}
+	
+	private static void patchSetGeneratedFlag(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.addField()
+				.targetClass("org.eclipse.jdt.internal.compiler.ast.ASTNode")
+				.fieldName("$generatedBy")
+				.fieldType("Lorg/eclipse/jdt/internal/compiler/ast/ASTNode;")
+				.setPublic().setTransient().build());
+		
+		sm.addScript(ScriptBuilder.addField()
+				.targetClass("org.eclipse.jdt.core.dom.ASTNode")
+				.fieldName("$isGenerated").fieldType("Z")
+				.setPublic().setTransient().build());
+		
+		sm.addScript(ScriptBuilder.wrapReturnValue()
+				.target(new TargetMatcher() {
+					@Override public boolean matches(String classSpec, String methodName, String descriptor) {
+						if (!"convert".equals(methodName)) return false;
+						
+						List<String> fullDesc = MethodTarget.decomposeFullDesc(descriptor);
+						if ("V".equals(fullDesc.get(0))) return false;
+						if (fullDesc.size() < 2) return false;
+						if (!fullDesc.get(1).startsWith("Lorg/eclipse/jdt/internal/compiler/ast/")) return false;
+						return true;
+					}
+					
+					@Override public Collection<String> getAffectedClasses() {
+						return Collections.singleton("org.eclipse.jdt.core.dom.ASTConverter");
+					}
+				}).request(StackRequest.PARAM1, StackRequest.RETURN_VALUE)
+				.wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "setIsGeneratedFlag",
+						"(Lorg/eclipse/jdt/core/dom/ASTNode;Lorg/eclipse/jdt/internal/compiler/ast/ASTNode;)V"))
+				.transplant().build());
+		
+		sm.addScript(ScriptBuilder.wrapMethodCall()
+				.target(new TargetMatcher() {
+					@Override public boolean matches(String classSpec, String methodName, String descriptor) {
+						if (!methodName.startsWith("convert")) return false;
+						
+						List<String> fullDesc = MethodTarget.decomposeFullDesc(descriptor);
+						if (fullDesc.size() < 2) return false;
+						if (!fullDesc.get(1).startsWith("Lorg/eclipse/jdt/internal/compiler/ast/")) return false;
+						
+						return true;
+					}
+					
+					@Override public Collection<String> getAffectedClasses() {
+						return Collections.singleton("org.eclipse.jdt.core.dom.ASTConverter");
+					}
+				}).methodToWrap(new Hook("org/eclipse/jdt/core/dom/SimpleName", "<init>", "(Lorg/eclipse/jdt/core/dom/AST;)V"))
+				.requestExtra(StackRequest.PARAM1)
+				.wrapMethod(new Hook("lombok/eclipse/agent/PatchFixes", "setIsGeneratedFlagForSimpleName",
+						"(Lorg/eclipse/jdt/core/dom/SimpleName;Ljava/lang/Object;)V"))
+				.transplant().build());
+	}
+	
+	private static void patchAvoidReparsingGeneratedCode(ScriptManager sm) {
+		final String PARSER_SIG1 = "org.eclipse.jdt.internal.compiler.parser.Parser";
+		sm.addScript(ScriptBuilder.exitEarly()
+				.target(new MethodTarget(PARSER_SIG1, "parse", "void",
+						"org.eclipse.jdt.internal.compiler.ast.MethodDeclaration",
+						"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
+				.decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+				.transplant().request(StackRequest.PARAM1).build());
+		
+		sm.addScript(ScriptBuilder.exitEarly()
+				.target(new MethodTarget(PARSER_SIG1, "parse", "void",
+						"org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration",
+						"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration", "boolean"))
+				.decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+				.transplant().request(StackRequest.PARAM1).build());
+		
+		sm.addScript(ScriptBuilder.exitEarly()
+				.target(new MethodTarget(PARSER_SIG1, "parse", "void",
+						"org.eclipse.jdt.internal.compiler.ast.Initializer",
+						"org.eclipse.jdt.internal.compiler.ast.TypeDeclaration",
+						"org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration"))
+				.decisionMethod(new Hook("lombok/eclipse/agent/PatchFixes", "checkBit24", "(Ljava/lang/Object;)Z"))
+				.transplant().request(StackRequest.PARAM1).build());
+	}
+	
+	private static void patchLombokizeAST(ScriptManager sm) {
+		sm.addScript(ScriptBuilder.addField()
+				.targetClass("org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration")
+				.fieldName("$lombokAST").fieldType("Ljava/lang/Object;")
+				.setPublic().setTransient().build());
+		
+		final String PARSER_SIG1 = "org.eclipse.jdt.internal.compiler.parser.Parser";
+		final String PARSER_SIG2 = "Lorg/eclipse/jdt/internal/compiler/parser/Parser;";
+		final String CUD_SIG1 = "org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration";
+		final String CUD_SIG2 = "Lorg/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration;";
+		
+		sm.addScript(ScriptBuilder.wrapReturnValue()
+				.target(new MethodTarget(PARSER_SIG1, "getMethodBodies", "void", CUD_SIG1))
+				.wrapMethod(new Hook("lombok/eclipse/TransformEclipseAST", "transform",
+						"(" + PARSER_SIG2 + CUD_SIG2 + ")V"))
+				.request(StackRequest.THIS, StackRequest.PARAM1).build());
+		
+		sm.addScript(ScriptBuilder.wrapReturnValue()
+				.target(new MethodTarget(PARSER_SIG1, "endParse", CUD_SIG1, "int"))
+				.wrapMethod(new Hook("lombok/eclipse/TransformEclipseAST", "transform_swapped",
+						"(" + CUD_SIG2 + PARSER_SIG2 + ")V"))
+				.request(StackRequest.THIS, StackRequest.RETURN_VALUE).build());
+	}
+}
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
new file mode 100644
index 00000000..5d54692e
--- /dev/null
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchFixes.java
@@ -0,0 +1,67 @@
+package lombok.eclipse.agent;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.SimpleName;
+
+public class PatchFixes {
+	public static int fixRetrieveStartingCatchPosition(int in) {
+		return in;
+	}
+	
+	private static final int BIT24 = 0x800000;
+	
+	public static boolean checkBit24(Object node) throws Exception {
+		int bits = (Integer)(node.getClass().getField("bits").get(node));
+		return (bits & BIT24) != 0;
+	}
+	
+	public static boolean skipRewritingGeneratedNodes(org.eclipse.jdt.core.dom.ASTNode node) throws Exception {
+		return ((Boolean)node.getClass().getField("$isGenerated").get(node)).booleanValue();
+	}
+	
+	public static void setIsGeneratedFlag(org.eclipse.jdt.core.dom.ASTNode domNode,
+			org.eclipse.jdt.internal.compiler.ast.ASTNode internalNode) throws Exception {
+		boolean isGenerated = internalNode.getClass().getField("$generatedBy").get(internalNode) != null;
+		if (isGenerated) {
+			domNode.getClass().getField("$isGenerated").set(domNode, true);
+			domNode.setFlags(domNode.getFlags() & ~ASTNode.ORIGINAL);
+		}
+	}
+	
+	public static void setIsGeneratedFlagForSimpleName(SimpleName name, Object internalNode) throws Exception {
+		if (internalNode instanceof org.eclipse.jdt.internal.compiler.ast.ASTNode) {
+			if (internalNode.getClass().getField("$generatedBy").get(internalNode) != null) {
+				name.getClass().getField("$isGenerated").set(name, true);
+			}
+		}
+	}
+	
+	public static IMethod[] removeGeneratedMethods(IMethod[] methods) throws Exception {
+		List<IMethod> result = new ArrayList<IMethod>();
+		for (IMethod m : methods) {
+			if (m.getNameRange().getLength() > 0) result.add(m);
+		}
+		return result.size() == methods.length ? methods : result.toArray(new IMethod[0]);
+	}
+	
+	public static SimpleName[] removeGeneratedSimpleNames(SimpleName[] in) throws Exception {
+		Field f = SimpleName.class.getField("$isGenerated");
+		
+		int count = 0;
+		for (int i = 0; i < in.length; i++) {
+			if (in[i] == null || !((Boolean)f.get(in[i])).booleanValue()) count++;
+		}
+		if (count == in.length) return in;
+		SimpleName[] newSimpleNames = new SimpleName[count];
+		count = 0;
+		for (int i = 0; i < in.length; i++) {
+			if (in[i] == null || !((Boolean)f.get(in[i])).booleanValue()) newSimpleNames[count++] = in[i];
+		}
+		return newSimpleNames;
+	}
+}
diff --git a/src/eclipseAgent/lombok/eclipse/agent/package-info.java b/src/eclipseAgent/lombok/eclipse/agent/package-info.java
new file mode 100644
index 00000000..12255f81
--- /dev/null
+++ b/src/eclipseAgent/lombok/eclipse/agent/package-info.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2009 Reinier Zwitserloot and Roel Spilker.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Contains the mechanism that instruments eclipse by being loaded as a javaagent.
+ */
+package lombok.eclipse.agent;
diff --git a/src/lombok/installer/AppleNativeLook.java b/src/installer/lombok/installer/AppleNativeLook.java
index 6e64032e..6e64032e 100644
--- a/src/lombok/installer/AppleNativeLook.java
+++ b/src/installer/lombok/installer/AppleNativeLook.java
diff --git a/src/lombok/installer/EclipseFinder.java b/src/installer/lombok/installer/EclipseFinder.java
index 8e45852c..8e45852c 100644
--- a/src/lombok/installer/EclipseFinder.java
+++ b/src/installer/lombok/installer/EclipseFinder.java
diff --git a/src/lombok/installer/EclipseLocation.java b/src/installer/lombok/installer/EclipseLocation.java
index c43c5042..c43c5042 100644
--- a/src/lombok/installer/EclipseLocation.java
+++ b/src/installer/lombok/installer/EclipseLocation.java
diff --git a/src/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java
index e1da5d31..e1da5d31 100644
--- a/src/lombok/installer/Installer.java
+++ b/src/installer/lombok/installer/Installer.java
diff --git a/src/lombok/installer/WindowsDriveInfo-i386.dll b/src/installer/lombok/installer/WindowsDriveInfo-i386.dll
index eb7fa49a..eb7fa49a 100644
--- a/src/lombok/installer/WindowsDriveInfo-i386.dll
+++ b/src/installer/lombok/installer/WindowsDriveInfo-i386.dll
diff --git a/src/lombok/installer/WindowsDriveInfo-x86_64.dll b/src/installer/lombok/installer/WindowsDriveInfo-x86_64.dll
index 0b7c9a83..0b7c9a83 100644
--- a/src/lombok/installer/WindowsDriveInfo-x86_64.dll
+++ b/src/installer/lombok/installer/WindowsDriveInfo-x86_64.dll
diff --git a/src/lombok/installer/WindowsDriveInfo.java b/src/installer/lombok/installer/WindowsDriveInfo.java
index 41a6b17e..41a6b17e 100644
--- a/src/lombok/installer/WindowsDriveInfo.java
+++ b/src/installer/lombok/installer/WindowsDriveInfo.java
diff --git a/src/lombok/installer/loading.gif b/src/installer/lombok/installer/loading.gif
index b9fc304a..b9fc304a 100644
--- a/src/lombok/installer/loading.gif
+++ b/src/installer/lombok/installer/loading.gif
diff --git a/src/lombok/installer/lombok.png b/src/installer/lombok/installer/lombok.png
index d4efde04..d4efde04 100644
--- a/src/lombok/installer/lombok.png
+++ b/src/installer/lombok/installer/lombok.png
diff --git a/src/lombok/installer/lombok.svg b/src/installer/lombok/installer/lombok.svg
index 0d561aea..0d561aea 100644
--- a/src/lombok/installer/lombok.svg
+++ b/src/installer/lombok/installer/lombok.svg
diff --git a/src/lombok/installer/lombokIcon.png b/src/installer/lombok/installer/lombokIcon.png
index 48fd4307..48fd4307 100644
--- a/src/lombok/installer/lombokIcon.png
+++ b/src/installer/lombok/installer/lombokIcon.png
diff --git a/src/lombok/installer/lombokText.png b/src/installer/lombok/installer/lombokText.png
index 279746cb..279746cb 100644
--- a/src/lombok/installer/lombokText.png
+++ b/src/installer/lombok/installer/lombokText.png
diff --git a/src/lombok/installer/lombokText.svg b/src/installer/lombok/installer/lombokText.svg
index 9fd2f73b..9fd2f73b 100644
--- a/src/lombok/installer/lombokText.svg
+++ b/src/installer/lombok/installer/lombokText.svg
diff --git a/src/lombok/installer/package-info.java b/src/installer/lombok/installer/package-info.java
index 14b329b4..14b329b4 100644
--- a/src/lombok/installer/package-info.java
+++ b/src/installer/lombok/installer/package-info.java