diff options
4 files changed, 14 insertions, 7 deletions
diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java index 072b6df2..9af88937 100644 --- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java +++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java @@ -1998,7 +1998,7 @@ public class EclipseHandlerUtil { int index = 0; for (; index < size; index++) { FieldDeclaration f = newArray[index]; - if (isEnumConstant(f) || isGenerated(f)) continue; + if (isEnumConstant(f) || isGenerated(f) || isRecordField(f)) continue; break; } System.arraycopy(newArray, index, newArray, index + 1, size - index); @@ -2761,6 +2761,13 @@ public class EclipseHandlerUtil { } /** + * Returns {@code true} If the provided node is a field declaration, and represents a field in a {@code record} declaration. + */ + public static boolean isRecordField(FieldDeclaration fieldDeclaration) { + return (fieldDeclaration.modifiers & AccRecord) != 0; + } + + /** * Returns {@code true) if the provided node is a type declaration <em>and</em> is <strong>not</strong> of any kind indicated by the flags (the intent is to pass flags usch as `ClassFileConstants.AccEnum`). */ static boolean isTypeAndDoesNotHaveFlags(EclipseNode typeNode, long flags) { diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index fde69e74..dc64c335 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -1,9 +1,9 @@ // version 19: import lombok.extern.flogger.Flogger; class LoggerFloggerRecord { - public @Flogger record Inner(com log) { - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + public @Flogger record Inner(String x) { /* Implicit */ private final String x; + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); <clinit>() { } public Inner(String x) { diff --git a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java index 673f83a3..91343ff2 100644 --- a/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java +++ b/test/transform/resource/after-ecj/LoggerSlf4jOnRecord.java @@ -1,9 +1,9 @@ // version 14: import lombok.extern.slf4j.Slf4j; -public @Slf4j record LoggerSlf4jOnRecord(org log, String a) { - private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); +public @Slf4j record LoggerSlf4jOnRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class); <clinit>() { } public LoggerSlf4jOnRecord(String a, String b) { diff --git a/test/transform/resource/after-ecj/SynchronizedInRecord.java b/test/transform/resource/after-ecj/SynchronizedInRecord.java index b4dc3770..4b586f3f 100644 --- a/test/transform/resource/after-ecj/SynchronizedInRecord.java +++ b/test/transform/resource/after-ecj/SynchronizedInRecord.java @@ -1,8 +1,8 @@ import lombok.Synchronized; -public record SynchronizedInRecord(java $lock, String a) { - private final java.lang.Object $lock = new java.lang.Object[0]; +public record SynchronizedInRecord(String a, String b) { /* Implicit */ private final String a; /* Implicit */ private final String b; + private final java.lang.Object $lock = new java.lang.Object[0]; public SynchronizedInRecord(String a, String b) { super(); .a = a; |