#1603 correcting generic args in staged builders

elucash · elucash · commit e7f5daa535bc · 2025-10-08T12:21:33.000-04:00
diff --git a/builder/test/org/immutables/builder/fixture/telescopic/HavingNonTrivialGenerics.java b/builder/test/org/immutables/builder/fixture/telescopic/HavingNonTrivialGenerics.java
@@ -0,0 +1,20 @@
+package org.immutables.builder.fixture.telescopic;
+
+import java.math.BigDecimal;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@Value.Style(stagedBuilder = true)
+public interface HavingNonTrivialGenerics<T extends Comparable<? super T>> extends Comparable<HavingNonTrivialGenerics<T>> {
+
+  T key();
+
+  BigDecimal a();
+
+  int b();
+
+  @Override
+  default int compareTo(HavingNonTrivialGenerics<T> other) {
+    return key().compareTo(other.key());
+  }
+}
diff --git a/value-processor/src/org/immutables/value/processor/Immutables.generator b/value-processor/src/org/immutables/value/processor/Immutables.generator
@@ -1446,7 +1446,7 @@ public interface [tb.nameBuildStartSimple][type.generics] {
 }
 
 [atGenerated type]
-public interface [nt.nameBuildStageSimple][type.generics] extends [tb.nameBuildStartSimple][type.generics] {}
+public interface [nt.nameBuildStageSimple][type.generics] extends [tb.nameBuildStartSimple][type.generics.args] {}
   [else]
 [atGenerated type]
 public interface [nt.nameBuildStageSimple][type.generics] {

Original file line number	Diff line number	Diff line change
`@@ -1446,7 +1446,7 @@ public interface [tb.nameBuildStartSimple][type.generics] {`
`1446`	`1446`	`}`
`1447`	`1447`
`1448`	`1448`	`[atGenerated type]`
`1449`		`-public interface [nt.nameBuildStageSimple][type.generics] extends [tb.nameBuildStartSimple][type.generics] {}`
	`1449`	`+public interface [nt.nameBuildStageSimple][type.generics] extends [tb.nameBuildStartSimple][type.generics.args] {}`
`1450`	`1450`	`[else]`
`1451`	`1451`	`[atGenerated type]`
`1452`	`1452`	`public interface [nt.nameBuildStageSimple][type.generics] {`