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, 56 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java
new file mode 100644
index 00000000..ac687d84
--- /dev/null
+++ b/test/transform/resource/after-delombok/EqualsAndHashCodeNestedShadow.java
@@ -0,0 +1,56 @@
+interface EqualsAndHashCodeNestedShadow {
+	interface Foo {
+	}
+	class Bar {
+		public static class Foo extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof EqualsAndHashCodeNestedShadow.Bar.Foo)) return false;
+				final EqualsAndHashCodeNestedShadow.Bar.Foo other = (EqualsAndHashCodeNestedShadow.Bar.Foo) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
+				return true;
+			}
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			protected boolean canEqual(final java.lang.Object other) {
+				return other instanceof EqualsAndHashCodeNestedShadow.Bar.Foo;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			public int hashCode() {
+				int result = 1;
+				return result;
+			}
+		}
+	}
+	class Baz {
+		public static class Foo<T> extends Bar implements EqualsAndHashCodeNestedShadow.Foo {
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			public boolean equals(final java.lang.Object o) {
+				if (o == this) return true;
+				if (!(o instanceof EqualsAndHashCodeNestedShadow.Baz.Foo)) return false;
+				final EqualsAndHashCodeNestedShadow.Baz.Foo<?> other = (EqualsAndHashCodeNestedShadow.Baz.Foo<?>) o;
+				if (!other.canEqual((java.lang.Object) this)) return false;
+				return true;
+			}
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			protected boolean canEqual(final java.lang.Object other) {
+				return other instanceof EqualsAndHashCodeNestedShadow.Baz.Foo;
+			}
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			@javax.annotation.Generated("lombok")
+			public int hashCode() {
+				int result = 1;
+				return result;
+			}
+		}
+	}
+}