Merge pull request #3215 from janrieke/superBuilderExtendsClauseCollisions

SuperBuilder: check extends/implements for collisions (fixes #3202)

1 files changed, 19 insertions, 0 deletions

diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
index 7418ac87..3b66f076 100644
--- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java
+++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java
@@ -1051,9 +1051,28 @@ public class HandleSuperBuilder extends JavacAnnotationHandler<SuperBuilder> {
 			}
 		}
 		
+		// 4. Add extends and implements clauses.
+		addFirstToken(usedNames, Javac.getExtendsClause(td));
+		for (JCExpression impl : td.getImplementsClause()) {
+			addFirstToken(usedNames, impl);
+		}
+		
 		return usedNames;
 	}
 	
+	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;
+		}
+		usedNames.add(type.toString());
+	}
+	
 	private String generateNonclashingNameFor(String classGenericName, java.util.HashSet<String> typeParamStrings) {
 		if (!typeParamStrings.contains(classGenericName)) return classGenericName;
 		int counter = 2;