tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-14 06:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3215 from janrieke/superBuilderExtendsClauseCollisions

Browse Source 
SuperBuilder: check extends/implements for collisions (fixes #3202)
This commit is contained in:
Reinier Zwitserloot authored and GitHub committed 2023-01-12 01:40:23 +01:00
2 parents f090e50d0d 0fcb446265
commit ef916881ad
5 files changed
+130 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/lombok/eclipse/handlers/HandleSuperBuilder.java
+18 -4
View File
@@ -51,7 +51,6 @@ import org.eclipse.jdt.internal.compiler.ast.FieldDeclaration;
import org.eclipse.jdt.internal.compiler.ast.FieldReference;
import org.eclipse.jdt.internal.compiler.ast.IfStatement;
import org.eclipse.jdt.internal.compiler.ast.Initializer;
import org.eclipse.jdt.internal.compiler.ast.MarkerAnnotation;
import org.eclipse.jdt.internal.compiler.ast.MessageSend;
import org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;
import org.eclipse.jdt.internal.compiler.ast.NullLiteral;
@@ -1100,14 +1099,29 @@ public class HandleSuperBuilder extends EclipseAnnotationHandler<SuperBuilder> {
if (td.fields != null) {
for (FieldDeclaration field : td.fields) {
if (field instanceof Initializer) continue;
char[][] typeName = field.type.getTypeName();
if (typeName.length >= 1) // Add the first token, because only that can collide.
usedNames.add(String.valueOf(typeName[0]));
addFirstToken(usedNames, field.type);
}
}
// 4. Add extends and implements clauses.
addFirstToken(usedNames, td.superclass);
if (td.superInterfaces != null) {
for (TypeReference typeReference : td.superInterfaces) {
addFirstToken(usedNames, typeReference);
}
}
return usedNames;
}
private void addFirstToken(java.util.Set<String> usedNames, TypeReference type) {
if (type == null)
return;
// Add the first token, because only that can collide.
char[][] typeName = type.getTypeName();
if (typeName != null && typeName.length >= 1)
usedNames.add(String.valueOf(typeName[0]));
}
private String generateNonclashingNameFor(String classGenericName, java.util.Set<String> typeParamStrings) {
if (!typeParamStrings.contains(classGenericName)) return classGenericName;
src/core/lombok/javac/handlers/HandleSuperBuilder.java
+19
View File
@@ -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;
test/transform/resource/after-delombok/SuperBuilderNameClashes.java
+46
View File
@@ -124,4 +124,50 @@ public class SuperBuilderNameClashes {
return new SuperBuilderNameClashes.C.CBuilderImpl();
}
}
interface B2 {
interface B4<X> {
}
}
interface B3<Y> {
}
public static class ExtendsClauseCollision extends B implements B2.B4<Object>, B3<Object> {
@java.lang.SuppressWarnings("all")
public static abstract class ExtendsClauseCollisionBuilder<C extends SuperBuilderNameClashes.ExtendsClauseCollision, B4 extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<C, B4>> extends B.BBuilder<C, B4> {
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected abstract B4 self();
@java.lang.Override
@java.lang.SuppressWarnings("all")
public abstract C build();
@java.lang.Override
@java.lang.SuppressWarnings("all")
public java.lang.String toString() {
return "SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString() + ")";
}
}
@java.lang.SuppressWarnings("all")
private static final class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<SuperBuilderNameClashes.ExtendsClauseCollision, SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl> {
@java.lang.SuppressWarnings("all")
private ExtendsClauseCollisionBuilderImpl() {
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
protected SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() {
return this;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
public SuperBuilderNameClashes.ExtendsClauseCollision build() {
return new SuperBuilderNameClashes.ExtendsClauseCollision(this);
}
}
@java.lang.SuppressWarnings("all")
protected ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<?, ?> b) {
super(b);
}
@java.lang.SuppressWarnings("all")
public static SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<?, ?> builder() {
return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl();
}
}
}
test/transform/resource/after-ecj/SuperBuilderNameClashes.java
+35
View File
@@ -101,6 +101,41 @@ public class SuperBuilderNameClashes {
return new SuperBuilderNameClashes.C.CBuilderImpl();
}
}
interface B2 {
interface B4<X> {
}
}
interface B3<Y> {
}
public static @lombok.experimental.SuperBuilder class ExtendsClauseCollision extends B implements B2.B4<Object>, B3<Object> {
public static abstract @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilder<C extends SuperBuilderNameClashes.ExtendsClauseCollision, B4 extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<C, B4>> extends B.BBuilder<C, B4> {
public ExtendsClauseCollisionBuilder() {
super();
}
protected abstract @java.lang.Override @java.lang.SuppressWarnings("all") B4 self();
public abstract @java.lang.Override @java.lang.SuppressWarnings("all") C build();
public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
return (("SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder(super=" + super.toString()) + ")");
}
}
private static final @java.lang.SuppressWarnings("all") class ExtendsClauseCollisionBuilderImpl extends SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<SuperBuilderNameClashes.ExtendsClauseCollision, SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl> {
private ExtendsClauseCollisionBuilderImpl() {
super();
}
protected @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl self() {
return this;
}
public @java.lang.Override @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision build() {
return new SuperBuilderNameClashes.ExtendsClauseCollision(this);
}
}
protected @java.lang.SuppressWarnings("all") ExtendsClauseCollision(final SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<?, ?> b) {
super(b);
}
public static @java.lang.SuppressWarnings("all") SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilder<?, ?> builder() {
return new SuperBuilderNameClashes.ExtendsClauseCollision.ExtendsClauseCollisionBuilderImpl();
}
}
public SuperBuilderNameClashes() {
super();
}
test/transform/resource/before/SuperBuilderNameClashes.java
+12
View File
@@ -14,4 +14,16 @@ public class SuperBuilderNameClashes {
public static class C {
C2 c2;
}
interface B2 {
interface B4<X> {
}
}
interface B3<Y> {
}
@lombok.experimental.SuperBuilder
public static class ExtendsClauseCollision extends B implements B2.B4<Object>, B3<Object> {
}
}