From 0fcb446265348753c2b448f98f2ad020d6d07d13 Mon Sep 17 00:00:00 2001
From: Jan Rieke <rieke@subshell.com>
Date: Fri, 17 Jun 2022 23:30:25 +0200
Subject: (SuperBuilder) fix javac type params on conflicting names

---
 src/core/lombok/javac/handlers/HandleSuperBuilder.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index 967141cd..3b66f076 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -1063,6 +1063,9 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 	private void addFirstToken(java.util.Set<String> usedNames, JCTree type) {
 		if (type == null) 
 			return;
+		if (type instanceof JCTypeApply) {
+			type = ((JCTypeApply)type).clazz;
+		}
 		while (type instanceof JCFieldAccess && ((JCFieldAccess)type).selected != null) {
 			// Add the first token, because only that can collide.
 			type = ((JCFieldAccess)type).selected;
-- 
cgit