From d96bf4cc364def4f949c00020297c1c6472c1446 Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Sat, 18 Feb 2023 23:10:57 +0100
Subject: [jdk20] Adds support for updated JCEnhancedForLoop

---
 src/core/lombok/javac/handlers/HandleVal.java      | 24 ++++++++++-
 .../lombok/javac/handlers/JavacHandlerUtil.java    | 48 ++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

(limited to 'src/core/lombok/javac/handlers')

diff --git a/src/core/lombok/javac/handlers/HandleVal.java b/src/core/lombok/javac/handlers/HandleVal.java
index d4fb1027..8f4b1a86 100644
--- a/src/core/lombok/javac/handlers/HandleVal.java
+++ b/src/core/lombok/javac/handlers/HandleVal.java
@@ -24,15 +24,19 @@ package lombok.javac.handlers;
 import static lombok.core.handlers.HandlerUtil.handleFlagUsage;
 import static lombok.javac.handlers.HandleDelegate.HANDLE_DELEGATE_PRIORITY;
 import static lombok.javac.handlers.JavacHandlerUtil.*;
+
+import java.lang.reflect.Field;
+
 import lombok.ConfigurationKeys;
 import lombok.val;
-import lombok.core.HandlerPriority;
 import lombok.var;
+import lombok.core.HandlerPriority;
 import lombok.javac.JavacASTAdapter;
 import lombok.javac.JavacASTVisitor;
 import lombok.javac.JavacNode;
 import lombok.javac.JavacResolution;
 import lombok.javac.ResolutionResetNeeded;
+import lombok.permit.Permit;
 import lombok.spi.Provides;
 
 import com.sun.tools.javac.code.Flags;
@@ -87,7 +91,8 @@ public class HandleVal extends JavacASTAdapter {
 		if (local.init == null) {
 			if (parentRaw instanceof JCEnhancedForLoop) {
 				JCEnhancedForLoop efl = (JCEnhancedForLoop) parentRaw;
-				if (efl.var == local) rhsOfEnhancedForLoop = efl.expr;
+				JCTree var = EnhancedForLoopReflect.getVarOrRecordPattern(efl);
+				if (var == local) rhsOfEnhancedForLoop = efl.expr;
 			}
 		}
 		
@@ -191,4 +196,19 @@ public class HandleVal extends JavacASTAdapter {
 			recursiveSetGeneratedBy(local.vartype, typeNode);
 		}
 	}
+	
+	private static class EnhancedForLoopReflect {
+		private static final Field varOrRecordPattern = Permit.permissiveGetField(JCEnhancedForLoop.class, "varOrRecordPattern");
+		
+		private static JCTree getVarOrRecordPattern(JCEnhancedForLoop loop) {
+			if (varOrRecordPattern == null) {
+				return loop.var;
+			}
+			
+			try {
+				return (JCTree) varOrRecordPattern.get(loop);
+			} catch (Exception ignore) {}
+			return null;
+		}
+	}
 }
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 9d153a72..593a1aa8 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -512,6 +512,13 @@ public class JavacHandlerUtil {
 		case LOCAL:
 			JCVariableDecl variable = (JCVariableDecl) parentNode.get();
 			variable.mods.annotations = filterList(variable.mods.annotations, annotation.get());
+			
+			if ((variable.mods.flags & GENERATED_MEMBER) != 0) {
+				JavacNode typeNode = upToTypeNode(annotation);
+				if (isRecord(typeNode)) {
+					RecordComponentReflect.deleteAnnotation((JCClassDecl) typeNode.get(), variable, annotation.get());
+				}
+			}
 			break;
 		case METHOD:
 			JCMethodDecl method = (JCMethodDecl) parentNode.get();
@@ -559,6 +566,47 @@ public class JavacHandlerUtil {
 		return newAnnotations.toList();
 	}
 	
+	private static List<JCAnnotation> filterListByPos(List<JCAnnotation> annotations, JCTree jcTree) {
+		ListBuffer<JCAnnotation> newAnnotations = new ListBuffer<JCAnnotation>();
+		for (JCAnnotation ann : annotations) {
+			if (jcTree.pos != ann.pos) newAnnotations.append(ann);
+		}
+		return newAnnotations.toList();
+	}
+	
+	
+	static class RecordComponentReflect {
+		
+		private static final Field astField;
+		private static final Method findRecordComponentToRemove;
+		
+		static {
+			Field a = null;
+			Method m = null;
+			try {
+				Class<?> forName = Class.forName("com.sun.tools.javac.code.Symbol$RecordComponent");
+				a = Permit.permissiveGetField(forName, "ast");
+				m = Permit.permissiveGetMethod(ClassSymbol.class, "findRecordComponentToRemove", JCVariableDecl.class);
+			} catch (Throwable e) {
+				// Ignore
+			}
+			astField = a;
+			findRecordComponentToRemove = m;
+		}
+		
+		static void deleteAnnotation(JCClassDecl record, JCVariableDecl component, JCTree annotation) {
+			if (astField == null || findRecordComponentToRemove == null) return;
+			
+			try {
+				Object toRemove = Permit.invokeSneaky(findRecordComponentToRemove, record.sym, component);
+				JCVariableDecl variable = (JCVariableDecl) Permit.get(astField, toRemove);
+				variable.mods.annotations =  filterListByPos(variable.mods.annotations, annotation);
+			} catch (Throwable e) {
+				// Ignore
+			}
+		}
+	}
+	
 	/** Serves as return value for the methods that check for the existence of fields and methods. */
 	public enum MemberExistsResult {
 		NOT_EXISTS, EXISTS_BY_LOMBOK, EXISTS_BY_USER;
-- 
cgit