Merge pull request #3479 from Rawi01/extensionmethod-record

Add support for extension methods on records

src/core/lombok/javac/handlers/HandleExtensionMethod.java

@@ -73,10 +73,10 @@ public void handle(final AnnotationValues<ExtensionMethod> annotation, final JCA
 
 		deleteAnnotationIfNeccessary(annotationNode, ExtensionMethod.class);
 		JavacNode typeNode = annotationNode.up();
-		boolean isClassOrEnumOrInterface = isClassOrEnumOrInterface(typeNode);
+		boolean isClassEnumInterfaceOrRecord = isClassEnumInterfaceOrRecord(typeNode);
 
-		if (!isClassOrEnumOrInterface) {
-			annotationNode.addError("@ExtensionMethod can only be used on a class or an enum or an interface");
+		if (!isClassEnumInterfaceOrRecord) {
+			annotationNode.addError("@ExtensionMethod can only be used on a class, an enum, an interface or a record");
 			return;
 		}
 

src/core/lombok/javac/handlers/JavacHandlerUtil.java

@@ -2122,10 +2122,20 @@ public static boolean isClassOrEnum(JavacNode typeNode) {
 		return isClassAndDoesNotHaveFlags(typeNode, Flags.INTERFACE | Flags.ANNOTATION | RECORD);
 	}
 
-	public static boolean isClassOrEnumOrInterface(JavacNode typeNode) {
+	/**
+	 * Returns {@code true} if the provided node is an actual class an enum or an interface and not some other type declaration (so, not an annotation definition, or record).
+	 */
+	public static boolean isClassEnumOrInterface(JavacNode typeNode) {
 		return isClassAndDoesNotHaveFlags(typeNode, Flags.ANNOTATION | RECORD);
 	}
 
+	/**
+	 * Returns {@code true} if the provided node is an actual class, an enum, an interface or a record and not some other type declaration (so, not an annotation definition).
+	 */
+	public static boolean isClassEnumInterfaceOrRecord(JavacNode typeNode) {
+		return isClassAndDoesNotHaveFlags(typeNode, Flags.ANNOTATION);
+	}
+
 	/**
 	 * Returns {@code true} if the provided node is an actual class, an enum or a record and not some other type declaration (so, not an annotation definition or interface).
 	 */

test/transform/resource/after-delombok/ExtensionMethodOnRecord.java

@@ -0,0 +1,12 @@
+// version 14:
+public record ExtensionMethodOnRecord() {
+	public void test() {
+		ExtensionMethodOnRecord.Extensions.intValue("1");
+	}
+
+	static class Extensions {
+		public static Integer intValue(String s) {
+			return Integer.valueOf(s);
+		}
+	}
+}

test/transform/resource/after-ecj/ExtensionMethodOnRecord.java

@@ -0,0 +1,18 @@
+// version 14:
+import lombok.experimental.ExtensionMethod;
+public @ExtensionMethod(ExtensionMethodOnRecord.Extensions.class) record ExtensionMethodOnRecord() {
+  static class Extensions {
+    Extensions() {
+      super();
+    }
+    public static Integer intValue(String s) {
+      return Integer.valueOf(s);
+    }
+  }
+  public ExtensionMethodOnRecord() {
+    super();
+  }
+  public void test() {
+    ExtensionMethodOnRecord.Extensions.intValue("1");
+  }
+}

test/transform/resource/before/ExtensionMethodOnRecord.java

@@ -0,0 +1,16 @@
+// version 14:
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(ExtensionMethodOnRecord.Extensions.class)
+public record ExtensionMethodOnRecord() {
+
+	public void test() {
+		"1".intValue();
+	}
+
+	static class Extensions {
+		public static Integer intValue(String s) {
+			return Integer.valueOf(s);
+		}
+	}
+}