Merge pull request #3330 from Rawi01/eclipse-record-tests

Inject fields after generated record fields

1 files changed, 8 insertions, 1 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) {