SuperBuilder toBuilder: moved static helper method to builder impl

7 files changed, 374 insertions, 63 deletions

diff --git a/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java b/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
index fc532afb..640e5a71 100644
--- a/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
@@ -298,7 +298,9 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 
 		if (toBuilder) {
 			// Generate $fillValuesFrom() method in the abstract builder.
-			injectMethod(builderType, generateFillValuesMethod(tdParent, superclassBuilderClass != null, builderGenericName, classGenericName, builderImplClassName, typeParams));
+			injectMethod(builderType, generateFillValuesMethod(tdParent, superclassBuilderClass != null, builderGenericName, classGenericName, builderClassName, typeParams));
+			// Generate $fillValuesFromInstanceIntoBuilder() method in the builder implementation class.
+			injectMethod(builderType, generateStaticFillValuesMethod(tdParent, builderClassName, typeParams, builderFields, ast));
 		}
 
 		// Generate abstract self() and build() methods in the abstract builder.
@@ -327,9 +329,9 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 		
 		if (addCleaning) injectMethod(builderType, generateCleanMethod(builderFields, builderType, ast));
 		
-		if ((td.modifiers & ClassFileConstants.AccAbstract) != 0 && !toBuilder) {
+		boolean isAbstract = (td.modifiers & ClassFileConstants.AccAbstract) != 0;
+		if (isAbstract) {
 			// Only non-abstract classes get the Builder implementation.
-			// However, if we want to generate a toBuilder, we need a helper function in the builder implementation class.
 			return;
 		}
 		
@@ -343,9 +345,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 		}
 
 		if (toBuilder) {
-			// Generate $fillValuesFromInstanceIntoBuilder() method in the builder implementation class.
-			injectMethod(builderImplType, generateStaticFillValuesMethod(tdParent, builderClassName, typeParams, builderFields, ast));
-			
+			// Add the toBuilder() method to the annotated class.
 			switch (methodExists(TO_BUILDER_METHOD_NAME_STRING, tdParent, 0)) {
 			case EXISTS_BY_USER:
 				annotationNode.addWarning("Not generating toBuilder() as it already exists.");
@@ -355,10 +355,6 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 			default:
 				// Should not happen.
 			}
-			if ((td.modifiers & ClassFileConstants.AccAbstract) != 0) {
-				// The rest of the builder implementation class is not necessary for abstract classes.
-				return;
-			}
 		}
 
 		// Create the self() and build() methods in the BuilderImpl.
@@ -605,7 +601,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 	 * }
 	 * </pre>
 	 */
-	private MethodDeclaration generateFillValuesMethod(EclipseNode tdParent, boolean inherited, String builderGenericName, String classGenericName, String builderImplClassName, TypeParameter[] typeParams) {
+	private MethodDeclaration generateFillValuesMethod(EclipseNode tdParent, boolean inherited, String builderGenericName, String classGenericName, String builderClassName, TypeParameter[] typeParams) {
 		MethodDeclaration out = new MethodDeclaration(((CompilationUnitDeclaration) tdParent.top().get()).compilationResult);
 		out.selector = FILL_VALUES_METHOD_NAME;
 		out.bits |= ECLIPSE_DO_NOT_TOUCH_FLAG;
@@ -629,7 +625,7 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
 
 		// Call the builder implemention's helper method that actually fills the values from the instance.
 		MessageSend callStaticFillValuesMethod = new MessageSend();
-		callStaticFillValuesMethod.receiver = new SingleNameReference(builderImplClassName.toCharArray(), 0);
+		callStaticFillValuesMethod.receiver = new SingleNameReference(builderClassName.toCharArray(), 0);
 		callStaticFillValuesMethod.selector = FILL_VALUES_STATIC_METHOD_NAME;
 		callStaticFillValuesMethod.arguments = new Expression[] {new SingleNameReference(INSTANCE_VARIABLE_NAME, 0), new ThisReference(0, 0)};
 		body.add(callStaticFillValuesMethod);
diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index f858cd29..f9686cba 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -242,7 +242,9 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 		
 		if (toBuilder) {
 			// Generate $fillValuesFrom() method in the abstract builder.
-			injectMethod(builderType, generateFillValuesMethod(tdParent, superclassBuilderClassExpression != null, builderGenericName, classGenericName, builderImplClassName));
+			injectMethod(builderType, generateFillValuesMethod(tdParent, superclassBuilderClassExpression != null, builderGenericName, classGenericName, builderClassName));
+			// Generate $fillValuesFromInstanceIntoBuilder() method in the builder implementation class.
+			injectMethod(builderType, generateStaticFillValuesMethod(tdParent, builderClassName, typeParams, builderFields));
 		}
 
 		// Generate abstract self() and build() methods in the abstract builder.
@@ -272,9 +274,8 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 		recursiveSetGeneratedBy(builderType.get(), ast, annotationNode.getContext());
 		
 		boolean isAbstract = (td.mods.flags & Flags.ABSTRACT) != 0;
-		if (!isAbstract || toBuilder) {
+		if (!isAbstract) {
 			// Only non-abstract classes get the Builder implementation.
-			// However, if we want to generate a toBuilder, we need a helper function in the builder implementation class.
 			
 			// Create the builder implementation class.
 			JavacNode builderImplType = findInnerClass(tdParent, builderImplClassName);
@@ -285,20 +286,13 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 				return;
 			}
 
-			if (toBuilder) {
-				// Generate $fillValuesFromInstanceIntoBuilder() method in the builder implementation class.
-				injectMethod(builderImplType, generateStaticFillValuesMethod(tdParent, builderClassName, typeParams, builderFields));
-			}
+			// Create a simple constructor for the BuilderImpl class.
+			JCMethodDecl cd = HandleConstructor.createConstructor(AccessLevel.PRIVATE, List.<JCAnnotation>nil(), builderImplType, List.<JavacNode>nil(), false, annotationNode);
+			if (cd != null) injectMethod(builderImplType, cd);
 			
-			if (!isAbstract) {
-				// Create a simple constructor for the BuilderImpl class.
-				JCMethodDecl cd = HandleConstructor.createConstructor(AccessLevel.PRIVATE, List.<JCAnnotation>nil(), builderImplType, List.<JavacNode>nil(), false, annotationNode);
-				if (cd != null) injectMethod(builderImplType, cd);
-				
-				// Create the self() and build() methods in the BuilderImpl.
-				injectMethod(builderImplType, generateSelfMethod(builderImplType, typeParams));
-				injectMethod(builderImplType, generateBuildMethod(buildMethodName, returnType, builderImplType, thrownExceptions));
-			}
+			// Create the self() and build() methods in the BuilderImpl.
+			injectMethod(builderImplType, generateSelfMethod(builderImplType, typeParams));
+			injectMethod(builderImplType, generateBuildMethod(buildMethodName, returnType, builderImplType, thrownExceptions));
 			
 			recursiveSetGeneratedBy(builderImplType.get(), ast, annotationNode.getContext());
 		}
@@ -307,18 +301,20 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 		generateBuilderBasedConstructor(tdParent, typeParams, builderFields, annotationNode, builderClassName,
 				superclassBuilderClassExpression != null);
 		
-		if (!isAbstract) {
-			// Only non-abstract classes get the builder() method.
+		if (isAbstract) {
+			// Only non-abstract classes get the builder() and toBuilder() methods.
+			return;
+		}
 			
-			// Add the builder() method to the annotated class.
-			// Allow users to specify their own builder() methods, e.g., to provide default values.
-			if (methodExists(builderMethodName, tdParent, -1) == MemberExistsResult.NOT_EXISTS) {
-				JCMethodDecl builderMethod = generateBuilderMethod(builderMethodName, builderClassName, builderImplClassName, annotationNode, tdParent, typeParams);
-				recursiveSetGeneratedBy(builderMethod, ast, annotationNode.getContext());
-				if (builderMethod != null) injectMethod(tdParent, builderMethod);
-			}
+		// Add the builder() method to the annotated class.
+		// Allow users to specify their own builder() methods, e.g., to provide default values.
+		if (methodExists(builderMethodName, tdParent, -1) == MemberExistsResult.NOT_EXISTS) {
+			JCMethodDecl builderMethod = generateBuilderMethod(builderMethodName, builderClassName, builderImplClassName, annotationNode, tdParent, typeParams);
+			recursiveSetGeneratedBy(builderMethod, ast, annotationNode.getContext());
+			if (builderMethod != null) injectMethod(tdParent, builderMethod);
 		}
 
+		// Add the toBuilder() method to the annotated class.
 		if (toBuilder) {
 			switch (methodExists(TO_BUILDER_METHOD_NAME, tdParent, 0)) {
 			case EXISTS_BY_USER:
diff --git a/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
new file mode 100644
index 00000000..096bd533
--- /dev/null
+++ b/test/transform/resource/after-delombok/SuperBuilderAbstractToBuilder.java
@@ -0,0 +1,168 @@
+public class SuperBuilderAbstractToBuilder {

+	public static class Parent {

+		int parentField;

+		@java.lang.SuppressWarnings("all")

+		public static abstract class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {

+			@java.lang.SuppressWarnings("all")

+			private int parentField;

+			@java.lang.SuppressWarnings("all")

+			protected B $fillValuesFrom(final C instance) {

+				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

+			@java.lang.SuppressWarnings("all")

+			private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

+				b.parentField(instance.parentField);

+			}

+			@java.lang.SuppressWarnings("all")

+			protected abstract B self();

+			@java.lang.SuppressWarnings("all")

+			public abstract C build();

+			@java.lang.SuppressWarnings("all")

+			public B parentField(final int parentField) {

+				this.parentField = parentField;

+				return self();

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField + ")";

+			}

+		}

+		@java.lang.SuppressWarnings("all")

+		private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {

+			@java.lang.SuppressWarnings("all")

+			private ParentBuilderImpl() {

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected ParentBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public Parent build() {

+				return new Parent(this);

+			}

+		}

+		@java.lang.SuppressWarnings("all")

+		protected Parent(final ParentBuilder<?, ?> b) {

+			this.parentField = b.parentField;

+		}

+		@java.lang.SuppressWarnings("all")

+		public static ParentBuilder<?, ?> builder() {

+			return new ParentBuilderImpl();

+		}

+		@java.lang.SuppressWarnings("all")

+		public ParentBuilder<?, ?> toBuilder() {

+			return new ParentBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static abstract class Child extends Parent {

+		double childField;

+		@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 double childField;

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected B $fillValuesFrom(final C instance) {

+				super.$fillValuesFrom(instance);

+				ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

+			@java.lang.SuppressWarnings("all")

+			private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

+				b.childField(instance.childField);

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected abstract B self();

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public abstract C build();

+			@java.lang.SuppressWarnings("all")

+			public B childField(final double childField) {

+				this.childField = childField;

+				return self();

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString() + ", childField=" + this.childField + ")";

+			}

+		}

+		@java.lang.SuppressWarnings("all")

+		protected Child(final ChildBuilder<?, ?> b) {

+			super(b);

+			this.childField = b.childField;

+		}

+	}

+	public static class GrandChild extends Child {

+		String grandChildField;

+		@java.lang.SuppressWarnings("all")

+		public static abstract class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {

+			@java.lang.SuppressWarnings("all")

+			private String grandChildField;

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected B $fillValuesFrom(final C instance) {

+				super.$fillValuesFrom(instance);

+				GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+				return self();

+			}

+			@java.lang.SuppressWarnings("all")

+			private static void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder<?, ?> b) {

+				b.grandChildField(instance.grandChildField);

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected abstract B self();

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public abstract C build();

+			@java.lang.SuppressWarnings("all")

+			public B grandChildField(final String grandChildField) {

+				this.grandChildField = grandChildField;

+				return self();

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public java.lang.String toString() {

+				return "SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString() + ", grandChildField=" + this.grandChildField + ")";

+			}

+		}

+		@java.lang.SuppressWarnings("all")

+		private static final class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {

+			@java.lang.SuppressWarnings("all")

+			private GrandChildBuilderImpl() {

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			protected GrandChildBuilderImpl self() {

+				return this;

+			}

+			@java.lang.Override

+			@java.lang.SuppressWarnings("all")

+			public GrandChild build() {

+				return new GrandChild(this);

+			}

+		}

+		@java.lang.SuppressWarnings("all")

+		protected GrandChild(final GrandChildBuilder<?, ?> b) {

+			super(b);

+			this.grandChildField = b.grandChildField;

+		}

+		@java.lang.SuppressWarnings("all")

+		public static GrandChildBuilder<?, ?> builder() {

+			return new GrandChildBuilderImpl();

+		}

+		@java.lang.SuppressWarnings("all")

+		public GrandChildBuilder<?, ?> toBuilder() {

+			return new GrandChildBuilderImpl().$fillValuesFrom(this);

+		}

+	}

+	public static void test() {

+		GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build();

+	}

+}

diff --git a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
index 7a80f019..dc0b4e70 100644
--- a/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
+++ b/test/transform/resource/after-delombok/SuperBuilderBasicToBuilder.java
@@ -26,10 +26,18 @@ public class SuperBuilderBasicToBuilder {
 			private java.util.ArrayList<String> items;

 			@java.lang.SuppressWarnings("all")

 			protected B $fillValuesFrom(final C instance) {

-				ParentBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);

+				ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

 				return self();

 			}

 			@java.lang.SuppressWarnings("all")

+			private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

+				b.field1(instance.field1);

+				b.obtainViaField(instance.field1);

+				b.obtainViaMethod(instance.method());

+				b.obtainViaStaticMethod(Parent.staticMethod(instance));

+				b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items);

+			}

+			@java.lang.SuppressWarnings("all")

 			protected abstract B self();

 			@java.lang.SuppressWarnings("all")

 			public abstract C build();

@@ -79,14 +87,6 @@ public class SuperBuilderBasicToBuilder {
 		@java.lang.SuppressWarnings("all")

 		private static final class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {

 			@java.lang.SuppressWarnings("all")

-			private static void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

-				b.field1(instance.field1);

-				b.obtainViaField(instance.field1);

-				b.obtainViaMethod(instance.method());

-				b.obtainViaStaticMethod(Parent.staticMethod(instance));

-				b.items(instance.items == null ? java.util.Collections.emptyList() : instance.items);

-			}

-			@java.lang.SuppressWarnings("all")

 			private ParentBuilderImpl() {

 			}

 			@java.lang.Override

@@ -138,9 +138,13 @@ public class SuperBuilderBasicToBuilder {
 			@java.lang.SuppressWarnings("all")

 			protected B $fillValuesFrom(final C instance) {

 				super.$fillValuesFrom(instance);

-				ChildBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);

+				ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

 				return self();

 			}

+			@java.lang.SuppressWarnings("all")

+			private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

+				b.field3(instance.field3);

+			}

 			@java.lang.Override

 			@java.lang.SuppressWarnings("all")

 			protected abstract B self();

@@ -161,10 +165,6 @@ public class SuperBuilderBasicToBuilder {
 		@java.lang.SuppressWarnings("all")

 		private static final class ChildBuilderImpl extends ChildBuilder<Child, ChildBuilderImpl> {

 			@java.lang.SuppressWarnings("all")

-			private static void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

-				b.field3(instance.field3);

-			}

-			@java.lang.SuppressWarnings("all")

 			private ChildBuilderImpl() {

 			}

 			@java.lang.Override

diff --git a/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java
new file mode 100644
index 00000000..668f6acf
--- /dev/null
+++ b/test/transform/resource/after-ecj/SuperBuilderAbstractToBuilder.java
@@ -0,0 +1,131 @@
+public class SuperBuilderAbstractToBuilder {

+  public static @lombok.experimental.SuperBuilder(toBuilder = true) class Parent {

+    public static abstract @java.lang.SuppressWarnings("all") class ParentBuilder<C extends Parent, B extends ParentBuilder<C, B>> {

+      private @java.lang.SuppressWarnings("all") int parentField;

+      public ParentBuilder() {

+        super();

+      }

+      protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

+        ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+        return self();

+      }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

+        b.parentField(instance.parentField);

+      }

+      protected abstract @java.lang.SuppressWarnings("all") B self();

+      public abstract @java.lang.SuppressWarnings("all") C build();

+      public @java.lang.SuppressWarnings("all") B parentField(final int parentField) {

+        this.parentField = parentField;

+        return self();

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

+        return (("SuperBuilderAbstractToBuilder.Parent.ParentBuilder(parentField=" + this.parentField) + ")");

+      }

+    }

+    private static final @java.lang.SuppressWarnings("all") class ParentBuilderImpl extends ParentBuilder<Parent, ParentBuilderImpl> {

+      private ParentBuilderImpl() {

+        super();

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") ParentBuilderImpl self() {

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") Parent build() {

+        return new Parent(this);

+      }

+    }

+    int parentField;

+    protected @java.lang.SuppressWarnings("all") Parent(final ParentBuilder<?, ?> b) {

+      super();

+      this.parentField = b.parentField;

+    }

+    public @java.lang.SuppressWarnings("all") ParentBuilder<?, ?> toBuilder() {

+      return new ParentBuilderImpl().$fillValuesFrom(this);

+    }

+    public static @java.lang.SuppressWarnings("all") ParentBuilder<?, ?> builder() {

+      return new ParentBuilderImpl();

+    }

+  }

+  public static abstract @lombok.experimental.SuperBuilder(toBuilder = true) class Child extends Parent {

+    public static abstract @java.lang.SuppressWarnings("all") class ChildBuilder<C extends Child, B extends ChildBuilder<C, B>> extends Parent.ParentBuilder<C, B> {

+      private @java.lang.SuppressWarnings("all") double childField;

+      public ChildBuilder() {

+        super();

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

+        super.$fillValuesFrom(instance);

+        ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+        return self();

+      }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

+        b.childField(instance.childField);

+      }

+      protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

+      public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      public @java.lang.SuppressWarnings("all") B childField(final double childField) {

+        this.childField = childField;

+        return self();

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

+        return (((("SuperBuilderAbstractToBuilder.Child.ChildBuilder(super=" + super.toString()) + ", childField=") + this.childField) + ")");

+      }

+    }

+    double childField;

+    protected @java.lang.SuppressWarnings("all") Child(final ChildBuilder<?, ?> b) {

+      super(b);

+      this.childField = b.childField;

+    }

+  }

+  public static @lombok.experimental.SuperBuilder(toBuilder = true) class GrandChild extends Child {

+    public static abstract @java.lang.SuppressWarnings("all") class GrandChildBuilder<C extends GrandChild, B extends GrandChildBuilder<C, B>> extends Child.ChildBuilder<C, B> {

+      private @java.lang.SuppressWarnings("all") String grandChildField;

+      public GrandChildBuilder() {

+        super();

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

+        super.$fillValuesFrom(instance);

+        GrandChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

+        return self();

+      }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final GrandChild instance, final GrandChildBuilder<?, ?> b) {

+        b.grandChildField(instance.grandChildField);

+      }

+      protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

+      public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

+      public @java.lang.SuppressWarnings("all") B grandChildField(final String grandChildField) {

+        this.grandChildField = grandChildField;

+        return self();

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {

+        return (((("SuperBuilderAbstractToBuilder.GrandChild.GrandChildBuilder(super=" + super.toString()) + ", grandChildField=") + this.grandChildField) + ")");

+      }

+    }

+    private static final @java.lang.SuppressWarnings("all") class GrandChildBuilderImpl extends GrandChildBuilder<GrandChild, GrandChildBuilderImpl> {

+      private GrandChildBuilderImpl() {

+        super();

+      }

+      protected @java.lang.Override @java.lang.SuppressWarnings("all") GrandChildBuilderImpl self() {

+        return this;

+      }

+      public @java.lang.Override @java.lang.SuppressWarnings("all") GrandChild build() {

+        return new GrandChild(this);

+      }

+    }

+    String grandChildField;

+    protected @java.lang.SuppressWarnings("all") GrandChild(final GrandChildBuilder<?, ?> b) {

+      super(b);

+      this.grandChildField = b.grandChildField;

+    }

+    public @java.lang.SuppressWarnings("all") GrandChildBuilder<?, ?> toBuilder() {

+      return new GrandChildBuilderImpl().$fillValuesFrom(this);

+    }

+    public static @java.lang.SuppressWarnings("all") GrandChildBuilder<?, ?> builder() {

+      return new GrandChildBuilderImpl();

+    }

+  }

+  public SuperBuilderAbstractToBuilder() {

+    super();

+  }

+  public static void test() {

+    GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build();

+  }

+}

diff --git a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
index be819d05..a491430a 100644
--- a/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
+++ b/test/transform/resource/after-ecj/SuperBuilderBasicToBuilder.java
@@ -11,9 +11,16 @@ public class SuperBuilderBasicToBuilder {
         super();

       }

       protected @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

-        ParentBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);

+        ParentBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

         return self();

       }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

+        b.field1(instance.field1);

+        b.obtainViaField(instance.field1);

+        b.obtainViaMethod(instance.method());

+        b.obtainViaStaticMethod(Parent.staticMethod(instance));

+        b.items(((instance.items == null) ? java.util.Collections.emptyList() : instance.items));

+      }

       protected abstract @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.SuppressWarnings("all") C build();

       public @java.lang.SuppressWarnings("all") B field1(final int field1) {

@@ -57,13 +64,6 @@ public class SuperBuilderBasicToBuilder {
       private ParentBuilderImpl() {

         super();

       }

-      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Parent instance, final ParentBuilder<?, ?> b) {

-        b.field1(instance.field1);

-        b.obtainViaField(instance.field1);

-        b.obtainViaMethod(instance.method());

-        b.obtainViaStaticMethod(Parent.staticMethod(instance));

-        b.items(((instance.items == null) ? java.util.Collections.emptyList() : instance.items));

-      }

       protected @java.lang.Override @java.lang.SuppressWarnings("all") ParentBuilderImpl self() {

         return this;

       }

@@ -116,9 +116,12 @@ public class SuperBuilderBasicToBuilder {
       }

       protected @java.lang.Override @java.lang.SuppressWarnings("all") B $fillValuesFrom(final C instance) {

         super.$fillValuesFrom(instance);

-        ChildBuilderImpl.$fillValuesFromInstanceIntoBuilder(instance, this);

+        ChildBuilder.$fillValuesFromInstanceIntoBuilder(instance, this);

         return self();

       }

+      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

+        b.field3(instance.field3);

+      }

       protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B self();

       public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();

       public @java.lang.SuppressWarnings("all") B field3(final double field3) {

@@ -133,9 +136,6 @@ public class SuperBuilderBasicToBuilder {
       private ChildBuilderImpl() {

         super();

       }

-      private static @java.lang.SuppressWarnings("all") void $fillValuesFromInstanceIntoBuilder(final Child instance, final ChildBuilder<?, ?> b) {

-        b.field3(instance.field3);

-      }

       protected @java.lang.Override @java.lang.SuppressWarnings("all") ChildBuilderImpl self() {

         return this;

       }

diff --git a/test/transform/resource/before/SuperBuilderAbstractToBuilder.java b/test/transform/resource/before/SuperBuilderAbstractToBuilder.java
new file mode 100644
index 00000000..3359829c
--- /dev/null
+++ b/test/transform/resource/before/SuperBuilderAbstractToBuilder.java
@@ -0,0 +1,20 @@
+public class SuperBuilderAbstractToBuilder {
+	@lombok.experimental.SuperBuilder(toBuilder = true)
+	public static class Parent {
+		int parentField;
+	}
+	
+	@lombok.experimental.SuperBuilder(toBuilder = true)
+	public abstract static class Child extends Parent {
+		double childField;
+	}
+	
+	@lombok.experimental.SuperBuilder(toBuilder = true)
+	public static class GrandChild extends Child {
+		String grandChildField;
+	}
+	
+	public static void test() {
+		GrandChild x = GrandChild.builder().grandChildField("").parentField(5).childField(2.5).build().toBuilder().build();
+	}
+}