Fixes issue 232, now we also patch dom.SingleVariableDecls. Fixes val import disappearing when organizing imports in Eclipse, when using val in a foreach.

1 files changed, 22 insertions, 2 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
index cca1d4d0..8c308912 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchValEclipsePortal.java
@@ -30,6 +30,7 @@ public class PatchValEclipsePortal {
 	static final String LOCALDECLARATION_SIG = "org.eclipse.jdt.internal.compiler.ast.LocalDeclaration";
 	static final String PARSER_SIG = "org.eclipse.jdt.internal.compiler.parser.Parser";
 	static final String VARIABLEDECLARATIONSTATEMENT_SIG = "org.eclipse.jdt.core.dom.VariableDeclarationStatement";
+	static final String SINGLEVARIABLEDECLARATION_SIG = "org.eclipse.jdt.core.dom.SingleVariableDeclaration";
 	static final String ASTCONVERTER_SIG = "org.eclipse.jdt.core.dom.ASTConverter";
 	
 	public static void copyInitializationOfForEachIterable(Object parser) {
@@ -72,13 +73,27 @@ public class PatchValEclipsePortal {
 		}
 	}
 	
+	public static void addFinalAndValAnnotationToSingleVariableDeclaration(Object converter, Object out, Object in) {
+		try {
+			Reflection.addFinalAndValAnnotationToSingleVariableDeclaration.invoke(null, converter, out, in);
+		} catch (NoClassDefFoundError e) {
+			//ignore, we don't have access to the correct ECJ classes, so lombok can't possibly
+			//do anything useful here.
+		} catch (IllegalAccessException e) {
+			Lombok.sneakyThrow(e);
+		} catch (InvocationTargetException e) {
+			Lombok.sneakyThrow(e);
+		}
+	}
+	
 	private static final class Reflection {
 		public static final Method copyInitializationOfForEachIterable;
 		public static final Method copyInitializationOfLocalDeclaration;
-		public static final Method addFinalAndValAnnotationToVariableDeclarationStatement; 
+		public static final Method addFinalAndValAnnotationToVariableDeclarationStatement;
+		public static final Method addFinalAndValAnnotationToSingleVariableDeclaration;
 		
 		static {
-			Method m = null, n = null, o = null;
+			Method m = null, n = null, o = null, p = null;
 			try {
 				m = PatchValEclipse.class.getMethod("copyInitializationOfForEachIterable", Class.forName(PARSER_SIG));
 				n = PatchValEclipse.class.getMethod("copyInitializationOfLocalDeclaration", Class.forName(PARSER_SIG));
@@ -86,6 +101,10 @@ public class PatchValEclipsePortal {
 						Object.class,
 						Class.forName(VARIABLEDECLARATIONSTATEMENT_SIG),
 						Class.forName(LOCALDECLARATION_SIG));
+				p = PatchValEclipse.class.getMethod("addFinalAndValAnnotationToSingleVariableDeclaration",
+						Object.class,
+						Class.forName(SINGLEVARIABLEDECLARATION_SIG),
+						Class.forName(LOCALDECLARATION_SIG));
 			} catch (Exception e) {
 				// That's problematic, but as long as no local classes are used we don't actually need it.
 				// Better fail on local classes than crash altogether.
@@ -93,6 +112,7 @@ public class PatchValEclipsePortal {
 			copyInitializationOfForEachIterable = m;
 			copyInitializationOfLocalDeclaration = n;
 			addFinalAndValAnnotationToVariableDeclarationStatement = o;
+			addFinalAndValAnnotationToSingleVariableDeclaration = p;
 			
 		}
 	}