From f67b66456adb7be54a8aa2653789c9643b6f6e13 Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Mon, 7 Aug 2023 22:19:08 +0200
Subject: [PATCH] [fixes #3450] Add support for extension methods on records

---
 .../javac/handlers/HandleExtensionMethod.java  |  6 +++---
 .../javac/handlers/JavacHandlerUtil.java       | 12 +++++++++++-
 .../ExtensionMethodOnRecord.java               | 12 ++++++++++++
 .../after-ecj/ExtensionMethodOnRecord.java     | 18 ++++++++++++++++++
 .../before/ExtensionMethodOnRecord.java        | 16 ++++++++++++++++
 5 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 test/transform/resource/after-delombok/ExtensionMethodOnRecord.java
 create mode 100644 test/transform/resource/after-ecj/ExtensionMethodOnRecord.java
 create mode 100644 test/transform/resource/before/ExtensionMethodOnRecord.java

diff --git a/src/core/lombok/javac/handlers/HandleExtensionMethod.java b/src/core/lombok/javac/handlers/HandleExtensionMethod.java
index cb797f9e..63b65bac 100644
--- a/src/core/lombok/javac/handlers/HandleExtensionMethod.java
+++ b/src/core/lombok/javac/handlers/HandleExtensionMethod.java
@@ -73,10 +73,10 @@ public class HandleExtensionMethod extends JavacAnnotationHandler<ExtensionMetho
 		
 		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;
 		}
 		
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 6993a6ba..a51f1382 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -2119,10 +2119,20 @@ public class JavacHandlerUtil {
 		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).
 	 */
diff --git a/test/transform/resource/after-delombok/ExtensionMethodOnRecord.java b/test/transform/resource/after-delombok/ExtensionMethodOnRecord.java
new file mode 100644
index 00000000..d09ecc10
--- /dev/null
+++ b/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);
+		}
+	}
+}
diff --git a/test/transform/resource/after-ecj/ExtensionMethodOnRecord.java b/test/transform/resource/after-ecj/ExtensionMethodOnRecord.java
new file mode 100644
index 00000000..eb6c5dbf
--- /dev/null
+++ b/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");
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/ExtensionMethodOnRecord.java b/test/transform/resource/before/ExtensionMethodOnRecord.java
new file mode 100644
index 00000000..4b1d9165
--- /dev/null
+++ b/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);
+		}
+	}
+}