2 files changed, 143 insertions, 12 deletions
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;
       }