Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 19 insertions, 0 deletions

diff --git a/test/transform/knownBroken/before/I1132RecursiveGenerics.java b/test/transform/knownBroken/before/I1132RecursiveGenerics.java
new file mode 100644
index 00000000..781886a7
--- /dev/null
+++ b/test/transform/knownBroken/before/I1132RecursiveGenerics.java
@@ -0,0 +1,19 @@
+// Compile with javac, it'll think the T in the generated build() method isn't type compatible.
+// Yet, when you take the delomboked output (which delombok will give, but with errors), THAT does compile.
+
+public class I1132RecursiveGenerics {
+	public static class Recursive<T extends Recursive<T>> {}
+	public static final class Rec extends Recursive<Rec> {}
+
+	@lombok.Builder(builderClassName = "MethodBuilder")
+	public static <T extends Recursive<T>> T create() {
+		return null;
+	}
+
+	public static void main(String[] args) {
+		final MethodBuilder<Rec> builder = I1132RecursiveGenerics.builder();
+		final Rec rec = builder.build();
+//		final Rec rec = I1132RecursiveGenerics.<Rec>builder().build();
+	}
+}
+