#1479 need to look at value, not key

elucash · elucash · commit c98038e82512 · 2023-08-27T02:09:46.000-04:00
diff --git a/value-fixture/src/org/immutables/fixture/generics/MultimapSafeVarargs.java b/value-fixture/src/org/immutables/fixture/generics/MultimapSafeVarargs.java
@@ -0,0 +1,22 @@
+package org.immutables.fixture.generics;
+
+import com.google.common.collect.Multimap;
+import org.immutables.value.Value;
+
+@Value.Enclosing
+public interface MultimapSafeVarargs {
+  @Value.Immutable
+  interface ParamKey {
+    Multimap<Val<String>, String> vals();
+  }
+  @Value.Immutable
+  interface ParamVal {
+    Multimap<String, Val<String>> vals();
+  }
+  @Value.Immutable
+  interface ParamBoth {
+    Multimap<Val<String>, Val<String>> vals();
+  }
+
+  interface Val<T> {}
+}
diff --git a/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java b/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java
@@ -993,7 +993,8 @@ public boolean hasTypeAnnotations() {
   }
 
   public boolean isNonRawElementType() {
-    return getElementType().indexOf('<') > 0;
+    List<String> args = typeParameters();
+    return !args.isEmpty() && args.get(args.size() - 1).indexOf('<') > 0;
   }
 
   public boolean isNonRawSecondaryElementType() {

Original file line number	Diff line number	Diff line change
`@@ -993,7 +993,8 @@ public boolean hasTypeAnnotations() {`
`993`	`993`	`}`
`994`	`994`
`995`	`995`	`public boolean isNonRawElementType() {`
`996`		`- return getElementType().indexOf('<') > 0;`
	`996`	`+ List<String> args = typeParameters();`
	`997`	`+ return !args.isEmpty() && args.get(args.size() - 1).indexOf('<') > 0;`
`997`	`998`	`}`
`998`	`999`
`999`	`1000`	`public boolean isNonRawSecondaryElementType() {`