Merge branch 'master' of github.com:rzwitserloot/lombok into feature/builder-setter-prefixes

22 files changed, 605 insertions, 225 deletions

diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
new file mode 100644
index 00000000..b9d4e0fa
--- /dev/null
+++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java
@@ -0,0 +1,72 @@
+class CheckerFrameworkBasic {
+	private final int x;
+	private final int y;
+	private int z;
+	@org.checkerframework.common.aliasing.qual.Unique
+	@java.lang.SuppressWarnings("all")
+	public CheckerFrameworkBasic(final int x, final int y) {
+		this.x = x;
+		this.y = y;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	public int getX() {
+		return this.x;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	public int getY() {
+		return this.y;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	public int getZ() {
+		return this.z;
+	}
+	@org.checkerframework.checker.builder.qual.ReturnsReceiver
+	@java.lang.SuppressWarnings("all")
+	public CheckerFrameworkBasic setZ(final int z) {
+		this.z = z;
+		return this;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public boolean equals(final java.lang.Object o) {
+		if (o == this) return true;
+		if (!(o instanceof CheckerFrameworkBasic)) return false;
+		final CheckerFrameworkBasic other = (CheckerFrameworkBasic) o;
+		if (!other.canEqual((java.lang.Object) this)) return false;
+		if (this.getX() != other.getX()) return false;
+		if (this.getY() != other.getY()) return false;
+		if (this.getZ() != other.getZ()) return false;
+		return true;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	protected boolean canEqual(final java.lang.Object other) {
+		return other instanceof CheckerFrameworkBasic;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 59;
+		int result = 1;
+		result = result * PRIME + this.getX();
+		result = result * PRIME + this.getY();
+		result = result * PRIME + this.getZ();
+		return result;
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "CheckerFrameworkBasic(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")";
+	}
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	public CheckerFrameworkBasic withX(final int x) {
+		return this.x == x ? this : new CheckerFrameworkBasic(x, this.y, this.z);
+	}
+}
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
new file mode 100644
index 00000000..d21ad044
--- /dev/null
+++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java
@@ -0,0 +1,106 @@
+// skip-idempotent
+import java.util.List;
+class CheckerFrameworkBuilder {
+	int x;
+	int y;
+	int z;
+	List<String> names;
+	@java.lang.SuppressWarnings("all")
+	private static int $default$x() {
+		return 5;
+	}
+	@org.checkerframework.common.aliasing.qual.Unique
+	@java.lang.SuppressWarnings("all")
+	CheckerFrameworkBuilder(final int x, final int y, final int z, final List<String> names) {
+		this.x = x;
+		this.y = y;
+		this.z = z;
+		this.names = names;
+	}
+	@java.lang.SuppressWarnings("all")
+	public static class CheckerFrameworkBuilderBuilder {
+		@java.lang.SuppressWarnings("all")
+		private boolean x$set;
+		@java.lang.SuppressWarnings("all")
+		private int x$value;
+		@java.lang.SuppressWarnings("all")
+		private int y;
+		@java.lang.SuppressWarnings("all")
+		private int z;
+		@java.lang.SuppressWarnings("all")
+		private java.util.ArrayList<String> names;
+		@org.checkerframework.common.aliasing.qual.Unique
+		@java.lang.SuppressWarnings("all")
+		CheckerFrameworkBuilderBuilder() {
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") CheckerFrameworkBuilderBuilder this, final int x) {
+			this.x$value = x;
+			x$set = true;
+			return this;
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") CheckerFrameworkBuilderBuilder this, final int y) {
+			this.y = y;
+			return this;
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") CheckerFrameworkBuilderBuilder this, final int z) {
+			this.z = z;
+			return this;
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder name(final String name) {
+			if (this.names == null) this.names = new java.util.ArrayList<String>();
+			this.names.add(name);
+			return this;
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder names(final java.util.Collection<? extends String> names) {
+			if (this.names == null) this.names = new java.util.ArrayList<String>();
+			this.names.addAll(names);
+			return this;
+		}
+		@org.checkerframework.checker.builder.qual.ReturnsReceiver
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilderBuilder clearNames() {
+			if (this.names != null) this.names.clear();
+			return this;
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.SuppressWarnings("all")
+		public CheckerFrameworkBuilder build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) CheckerFrameworkBuilderBuilder this) {
+			java.util.List<String> names;
+			switch (this.names == null ? 0 : this.names.size()) {
+			case 0: 
+				names = java.util.Collections.emptyList();
+				break;
+			case 1: 
+				names = java.util.Collections.singletonList(this.names.get(0));
+				break;
+			default: 
+				names = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.names));
+			}
+			int x$value = this.x$value;
+			if (!x$set) x$value = CheckerFrameworkBuilder.$default$x();
+			return new CheckerFrameworkBuilder(x$value, y, z, names);
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.Override
+		@java.lang.SuppressWarnings("all")
+		public java.lang.String toString() {
+			return "CheckerFrameworkBuilder.CheckerFrameworkBuilderBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")";
+		}
+	}
+	@org.checkerframework.common.aliasing.qual.Unique
+	@org.checkerframework.dataflow.qual.SideEffectFree
+	@java.lang.SuppressWarnings("all")
+	public static CheckerFrameworkBuilderBuilder builder() {
+		return new CheckerFrameworkBuilderBuilder();
+	}
+}
diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
new file mode 100644
index 00000000..40876369
--- /dev/null
+++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java
@@ -0,0 +1,202 @@
+// skip-idempotent
+import java.util.List;
+class CheckerFrameworkSuperBuilder {
+	public static class Parent {
+		int x;
+		int y;
+		int z;
+		List<String> names;
+		@java.lang.SuppressWarnings("all")
+		private static int $default$x() {
+			return 5;
+		}
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {
+			@java.lang.SuppressWarnings("all")
+			private boolean x$set;
+			@java.lang.SuppressWarnings("all")
+			private int x$value;
+			@java.lang.SuppressWarnings("all")
+			private int y;
+			@java.lang.SuppressWarnings("all")
+			private int z;
+			@java.lang.SuppressWarnings("all")
+			private java.util.ArrayList<String> names;
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.SuppressWarnings("all")
+			public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) Parent this);
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B x(@org.checkerframework.checker.builder.qual.NotCalledMethods("x") ParentBuilder this, final int x) {
+				this.x$value = x;
+				x$set = true;
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B y(@org.checkerframework.checker.builder.qual.NotCalledMethods("y") ParentBuilder this, final int y) {
+				this.y = y;
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B z(@org.checkerframework.checker.builder.qual.NotCalledMethods("z") ParentBuilder this, final int z) {
+				this.z = z;
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B name(final String name) {
+				if (this.names == null) this.names = new java.util.ArrayList<String>();
+				this.names.add(name);
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B names(final java.util.Collection<? extends String> names) {
+				if (this.names == null) this.names = new java.util.ArrayList<String>();
+				this.names.addAll(names);
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B clearNames() {
+				if (this.names != null) this.names.clear();
+				return self();
+			}
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "CheckerFrameworkSuperBuilder.Parent.ParentBuilder(x$value=" + this.x$value + ", y=" + this.y + ", z=" + this.z + ", names=" + this.names + ")";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {
+			@org.checkerframework.common.aliasing.qual.Unique
+			@java.lang.SuppressWarnings("all")
+			private ParentBuilderImpl() {
+			}
+			@java.lang.Override
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.SuppressWarnings("all")
+			protected ParentBuilderImpl self() {
+				return this;
+			}
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Parent build(@org.checkerframework.checker.builder.qual.CalledMethods({"y", "z"}) ParentBuilderImpl this) {
+				return new Parent(this);
+			}
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.SuppressWarnings("all")
+		protected Parent(final ParentBuilder<?, ?> b) {
+			if (b.x$set) this.x = b.x$value;
+			 else this.x = Parent.$default$x();
+			this.y = b.y;
+			this.z = b.z;
+			java.util.List<String> names;
+			switch (b.names == null ? 0 : b.names.size()) {
+			case 0: 
+				names = java.util.Collections.emptyList();
+				break;
+			case 1: 
+				names = java.util.Collections.singletonList(b.names.get(0));
+				break;
+			default: 
+				names = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(b.names));
+			}
+			this.names = names;
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.SuppressWarnings("all")
+		public static ParentBuilder<?, ?> builder() {
+			return new ParentBuilderImpl();
+		}
+	}
+	public static class Child extends Parent {
+		int a;
+		int b;
+		@java.lang.SuppressWarnings("all")
+		private static int $default$a() {
+			return 1;
+		}
+		@java.lang.SuppressWarnings("all")
+		public static abstract class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {
+			@java.lang.SuppressWarnings("all")
+			private boolean a$set;
+			@java.lang.SuppressWarnings("all")
+			private int a$value;
+			@java.lang.SuppressWarnings("all")
+			private int b;
+			@java.lang.Override
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.SuppressWarnings("all")
+			protected abstract B self();
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public abstract C build(@org.checkerframework.checker.builder.qual.CalledMethods("b") Child this);
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B a(@org.checkerframework.checker.builder.qual.NotCalledMethods("a") ChildBuilder this, final int a) {
+				this.a$value = a;
+				a$set = true;
+				return self();
+			}
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@java.lang.SuppressWarnings("all")
+			public B b(@org.checkerframework.checker.builder.qual.NotCalledMethods("b") ChildBuilder this, final int b) {
+				this.b = b;
+				return self();
+			}
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public java.lang.String toString() {
+				return "CheckerFrameworkSuperBuilder.Child.ChildBuilder(super=" + super.toString() + ", a$value=" + this.a$value + ", b=" + this.b + ")";
+			}
+		}
+		@java.lang.SuppressWarnings("all")
+		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {
+			@org.checkerframework.common.aliasing.qual.Unique
+			@java.lang.SuppressWarnings("all")
+			private ChildBuilderImpl() {
+			}
+			@java.lang.Override
+			@org.checkerframework.checker.builder.qual.ReturnsReceiver
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.SuppressWarnings("all")
+			protected ChildBuilderImpl self() {
+				return this;
+			}
+			@org.checkerframework.dataflow.qual.SideEffectFree
+			@java.lang.Override
+			@java.lang.SuppressWarnings("all")
+			public Child build(@org.checkerframework.checker.builder.qual.CalledMethods("b") ChildBuilderImpl this) {
+				return new Child(this);
+			}
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.SuppressWarnings("all")
+		protected Child(final ChildBuilder<?, ?> b) {
+			super(b);
+			if (b.a$set) this.a = b.a$value;
+			 else this.a = Child.$default$a();
+			this.b = b.b;
+		}
+		@org.checkerframework.dataflow.qual.SideEffectFree
+		@java.lang.SuppressWarnings("all")
+		public static ChildBuilder<?, ?> builder() {
+			return new ChildBuilderImpl();
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java
index 8c0505e7..97524b9d 100644
--- a/test/transform/resource/after-delombok/SetterAndWitherJavadoc.java
+++ b/test/transform/resource/after-delombok/SetterAndWithMethodJavadoc.java
@@ -1,4 +1,4 @@
-class SetterAndWitherJavadoc {
+class SetterAndWithMethodJavadoc {
 	/**
 	 * Some value.
 	 */
@@ -7,7 +7,7 @@ class SetterAndWitherJavadoc {
 	 * Some other value.
 	 */
 	int j;
-	SetterAndWitherJavadoc(int i, int j) {
+	SetterAndWithMethodJavadoc(int i, int j) {
 		this.i = i;
 		this.j = j;
 	}
@@ -24,8 +24,8 @@ class SetterAndWitherJavadoc {
 	 * @param the new value
 	 */
 	@java.lang.SuppressWarnings("all")
-	public SetterAndWitherJavadoc withI(final int i) {
-		return this.i == i ? this : new SetterAndWitherJavadoc(i, this.j);
+	public SetterAndWithMethodJavadoc withI(final int i) {
+		return this.i == i ? this : new SetterAndWithMethodJavadoc(i, this.j);
 	}
 	/**
 	 * Set some other value.
@@ -40,7 +40,7 @@ class SetterAndWitherJavadoc {
 	 * @param the other new other value
 	 */
 	@java.lang.SuppressWarnings("all")
-	public SetterAndWitherJavadoc withJ(final int j) {
-		return this.j == j ? this : new SetterAndWitherJavadoc(this.i, j);
+	public SetterAndWithMethodJavadoc withJ(final int j) {
+		return this.j == j ? this : new SetterAndWithMethodJavadoc(this.i, j);
 	}
 }
diff --git a/test/transform/resource/after-delombok/WithAlreadyExists.java b/test/transform/resource/after-delombok/WithAlreadyExists.java
new file mode 100644
index 00000000..a9cb975d
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithAlreadyExists.java
@@ -0,0 +1,71 @@
+class With1 {
+	boolean foo;
+	void withFoo(boolean foo) {
+	}
+	With1(boolean foo) {
+	}
+}
+class With2 {
+	boolean foo;
+	void withFoo(String foo) {
+	}
+	With2(boolean foo) {
+	}
+}
+class With3 {
+	String foo;
+	void withFoo(boolean foo) {
+	}
+	With3(String foo) {
+	}
+}
+class With4 {
+	String foo;
+	void withFoo(String foo) {
+	}
+	With4(String foo) {
+	}
+}
+class With5 {
+	String foo;
+	void withFoo() {
+	}
+	With5(String foo) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public With5 withFoo(final String foo) {
+		return this.foo == foo ? this : new With5(foo);
+	}
+}
+class With6 {
+	String foo;
+	void withFoo(String foo, int x) {
+	}
+	With6(String foo) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public With6 withFoo(final String foo) {
+		return this.foo == foo ? this : new With6(foo);
+	}
+}
+class With7 {
+	String foo;
+	void withFoo(String foo, Object... x) {
+	}
+	With7(String foo) {
+	}
+}
+class With8 {
+	boolean isFoo;
+	void withIsFoo(boolean foo) {
+	}
+	With8(boolean foo) {
+	}
+}
+class With9 {
+	boolean isFoo;
+	void withFoo(boolean foo) {
+	}
+	With9(boolean foo) {
+	}
+}
diff --git a/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java
new file mode 100644
index 00000000..131e792c
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithAndAllArgsConstructor.java
@@ -0,0 +1,22 @@
+class WithAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
+	J test;
+	java.util.List<L> test2;
+	final int x = 10;
+	int y = 20;
+	final int z;
+	@java.lang.SuppressWarnings("all")
+	public WithAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
+		this.test = test;
+		this.test2 = test2;
+		this.y = y;
+		this.z = z;
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithAndAllArgsConstructor<T, J, L> withTest(final J test) {
+		return this.test == test ? this : new WithAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z);
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
+		return this.test2 == test2 ? this : new WithAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z);
+	}
+}
diff --git a/test/transform/resource/after-delombok/WithMethodAbstract.java b/test/transform/resource/after-delombok/WithMethodAbstract.java
new file mode 100644
index 00000000..16f6f060
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithMethodAbstract.java
@@ -0,0 +1,5 @@
+abstract class WithMethodAbstract {
+	String foo;
+	@java.lang.SuppressWarnings("all")
+	public abstract WithMethodAbstract withFoo(final String foo);
+}
diff --git a/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java
new file mode 100644
index 00000000..03b96d33
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithMethodMarkedDeprecated.java
@@ -0,0 +1,23 @@
+class WithMethodMarkedDeprecated {
+	@Deprecated
+	int annotation;
+	/**
+	 * @deprecated
+	 */
+	int javadoc;
+	WithMethodMarkedDeprecated(int annotation, int javadoc) {
+	}
+	@java.lang.Deprecated
+	@java.lang.SuppressWarnings("all")
+	public WithMethodMarkedDeprecated withAnnotation(final int annotation) {
+		return this.annotation == annotation ? this : new WithMethodMarkedDeprecated(annotation, this.javadoc);
+	}
+	/**
+	 * @deprecated
+	 */
+	@java.lang.Deprecated
+	@java.lang.SuppressWarnings("all")
+	public WithMethodMarkedDeprecated withJavadoc(final int javadoc) {
+		return this.javadoc == javadoc ? this : new WithMethodMarkedDeprecated(this.annotation, javadoc);
+	}
+}
diff --git a/test/transform/resource/after-delombok/WithOnClass.java b/test/transform/resource/after-delombok/WithOnClass.java
new file mode 100644
index 00000000..d6fb6fdf
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithOnClass.java
@@ -0,0 +1,54 @@
+class WithOnClass1 {
+	boolean isNone;
+	boolean isPublic;
+	WithOnClass1(boolean isNone, boolean isPublic) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithOnClass1 withPublic(final boolean isPublic) {
+		return this.isPublic == isPublic ? this : new WithOnClass1(this.isNone, isPublic);
+	}
+}
+class WithOnClass2 {
+	boolean isNone;
+	boolean isProtected;
+	boolean isPackage;
+	WithOnClass2(boolean isNone, boolean isProtected, boolean isPackage) {
+	}
+	@java.lang.SuppressWarnings("all")
+	protected WithOnClass2 withProtected(final boolean isProtected) {
+		return this.isProtected == isProtected ? this : new WithOnClass2(this.isNone, isProtected, this.isPackage);
+	}
+	@java.lang.SuppressWarnings("all")
+	WithOnClass2 withPackage(final boolean isPackage) {
+		return this.isPackage == isPackage ? this : new WithOnClass2(this.isNone, this.isProtected, isPackage);
+	}
+}
+class WithOnClass3 {
+	String couldBeNull;
+	@lombok.NonNull
+	String nonNull;
+	WithOnClass3(String couldBeNull, String nonNull) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithOnClass3 withCouldBeNull(final String couldBeNull) {
+		return this.couldBeNull == couldBeNull ? this : new WithOnClass3(couldBeNull, this.nonNull);
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithOnClass3 withNonNull(@lombok.NonNull final String nonNull) {
+		if (nonNull == null) {
+			throw new java.lang.NullPointerException("nonNull is marked non-null but is null");
+		}
+		return this.nonNull == nonNull ? this : new WithOnClass3(this.couldBeNull, nonNull);
+	}
+}
+class WithOnClass4 {
+	final int fX = 10;
+	final int fY;
+	WithOnClass4(int y) {
+		this.fY = y;
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithOnClass4 withY(final int fY) {
+		return this.fY == fY ? this : new WithOnClass4(fY);
+	}
+}
diff --git a/test/transform/resource/after-delombok/WitherOnStatic.java b/test/transform/resource/after-delombok/WithOnStatic.java
index e481beb7..b234f0d6 100644
--- a/test/transform/resource/after-delombok/WitherOnStatic.java
+++ b/test/transform/resource/after-delombok/WithOnStatic.java
@@ -1,4 +1,4 @@
-class WitherOnStatic {
+class WithOnStatic {
 	static boolean foo;
 	static int bar;
 }
diff --git a/test/transform/resource/after-delombok/WithPlain.java b/test/transform/resource/after-delombok/WithPlain.java
new file mode 100644
index 00000000..1a6ff22f
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithPlain.java
@@ -0,0 +1,16 @@
+class WithPlain {
+	int i;
+	final int foo;
+	WithPlain(int i, int foo) {
+		this.i = i;
+		this.foo = foo;
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithPlain withI(final int i) {
+		return this.i == i ? this : new WithPlain(i, this.foo);
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithPlain withFoo(final int foo) {
+		return this.foo == foo ? this : new WithPlain(this.i, foo);
+	}
+}
diff --git a/test/transform/resource/after-delombok/WithWithDollar.java b/test/transform/resource/after-delombok/WithWithDollar.java
new file mode 100644
index 00000000..79abcc12
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithWithDollar.java
@@ -0,0 +1,3 @@
+class WithWithDollar {
+	int $i;
+}
diff --git a/test/transform/resource/after-delombok/WithWithGenerics.java b/test/transform/resource/after-delombok/WithWithGenerics.java
new file mode 100644
index 00000000..ac34f01a
--- /dev/null
+++ b/test/transform/resource/after-delombok/WithWithGenerics.java
@@ -0,0 +1,20 @@
+class WithWithGenerics<T, J extends T, L extends java.lang.Number> {
+	J test;
+	java.util.List<L> test2;
+	java.util.List<? extends L> test3;
+	int $i;
+	public WithWithGenerics(J test, java.util.List<L> test2, java.util.List<? extends L> test3) {
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithWithGenerics<T, J, L> withTest(final J test) {
+		return this.test == test ? this : new WithWithGenerics<T, J, L>(test, this.test2, this.test3);
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithWithGenerics<T, J, L> withTest2(final java.util.List<L> test2) {
+		return this.test2 == test2 ? this : new WithWithGenerics<T, J, L>(this.test, test2, this.test3);
+	}
+	@java.lang.SuppressWarnings("all")
+	public WithWithGenerics<T, J, L> withTest3(final java.util.List<? extends L> test3) {
+		return this.test3 == test3 ? this : new WithWithGenerics<T, J, L>(this.test, this.test2, test3);
+	}
+}
diff --git a/test/transform/resource/after-delombok/WitherTypeAnnos.java b/test/transform/resource/after-delombok/WithWithTypeAnnos.java
index b57438af..bf7559ba 100644
--- a/test/transform/resource/after-delombok/WitherTypeAnnos.java
+++ b/test/transform/resource/after-delombok/WithWithTypeAnnos.java
@@ -7,15 +7,15 @@ import java.util.List;
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @interface TB {
 }
-class WitherTypeAnnos {
+class WithWithTypeAnnos {
 	@TA
 	@TB
 	final List<String> foo;
-	WitherTypeAnnos(@TA @TB List<String> foo) {
+	WithWithTypeAnnos(@TA @TB List<String> foo) {
 		this.foo = foo;
 	}
 	@java.lang.SuppressWarnings("all")
-	public WitherTypeAnnos withFoo(@TA final List<String> foo) {
-		return this.foo == foo ? this : new WitherTypeAnnos(foo);
+	public WithWithTypeAnnos withFoo(@TA final List<String> foo) {
+		return this.foo == foo ? this : new WithWithTypeAnnos(foo);
 	}
 }
diff --git a/test/transform/resource/after-delombok/WitherAlreadyExists.java b/test/transform/resource/after-delombok/WitherAlreadyExists.java
deleted file mode 100644
index d609bc7b..00000000
--- a/test/transform/resource/after-delombok/WitherAlreadyExists.java
+++ /dev/null
@@ -1,71 +0,0 @@
-class Wither1 {
-	boolean foo;
-	void withFoo(boolean foo) {
-	}
-	Wither1(boolean foo) {
-	}
-}
-class Wither2 {
-	boolean foo;
-	void withFoo(String foo) {
-	}
-	Wither2(boolean foo) {
-	}
-}
-class Wither3 {
-	String foo;
-	void withFoo(boolean foo) {
-	}
-	Wither3(String foo) {
-	}
-}
-class Wither4 {
-	String foo;
-	void withFoo(String foo) {
-	}
-	Wither4(String foo) {
-	}
-}
-class Wither5 {
-	String foo;
-	void withFoo() {
-	}
-	Wither5(String foo) {
-	}
-	@java.lang.SuppressWarnings("all")
-	public Wither5 withFoo(final String foo) {
-		return this.foo == foo ? this : new Wither5(foo);
-	}
-}
-class Wither6 {
-	String foo;
-	void withFoo(String foo, int x) {
-	}
-	Wither6(String foo) {
-	}
-	@java.lang.SuppressWarnings("all")
-	public Wither6 withFoo(final String foo) {
-		return this.foo == foo ? this : new Wither6(foo);
-	}
-}
-class Wither7 {
-	String foo;
-	void withFoo(String foo, Object... x) {
-	}
-	Wither7(String