Merge branch 'master' into jdk8. Also added some major fixes whilst merging.

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java
	src/utils/lombok/javac/CommentCatcher.java
	src/utils/lombok/javac/Javac.java

1 files changed, 43 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java
new file mode 100644
index 00000000..11c0e58c
--- /dev/null
+++ b/test/transform/resource/after-delombok/BuilderSimple.java
@@ -0,0 +1,43 @@
+import java.util.List;
+class BuilderSimple<T> {
+	private final int noshow = 0;
+	private final int yes;
+	private List<T> also;
+	private int $butNotMe;
+	@java.lang.SuppressWarnings("all")
+	BuilderSimple(final int yes, final List<T> also) {
+		this.yes = yes;
+		this.also = also;
+	}
+	@java.lang.SuppressWarnings("all")
+	public static class BuilderSimpleBuilder<T> {
+		private int yes;
+		private List<T> also;
+		@java.lang.SuppressWarnings("all")
+		BuilderSimpleBuilder() {
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSimpleBuilder<T> yes(final int yes) {
+			this.yes = yes;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSimpleBuilder<T> also(final List<T> also) {
+			this.also = also;
+			return this;
+		}
+		@java.lang.SuppressWarnings("all")
+		public BuilderSimple<T> build() {
+			return new BuilderSimple<T>(yes, also);
+		}
+		@java.lang.Override
+		@java.lang.SuppressWarnings("all")
+		public java.lang.String toString() {
+			return "BuilderSimple.BuilderSimpleBuilder(yes=" + this.yes + ", also=" + this.also + ")";
+		}
+	}
+	@java.lang.SuppressWarnings("all")
+	public static <T> BuilderSimpleBuilder<T> builder() {
+		return new BuilderSimpleBuilder<T>();
+	}
+}