Merge pull request #3136 from Rawi01/eclipse-rename

Search patched method also by parameters

1 files changed, 17 insertions, 0 deletions

diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
index e0c330a2..a844239f 100755
--- a/src/eclipseAgent/lombok/launch/PatchFixesHider.java
+++ b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
@@ -39,6 +39,7 @@ import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.Type;
@@ -780,6 +781,22 @@ final class PatchFixesHider {
 			return newSimpleNames;
 		}
 		
+		public static Name[] removeGeneratedNames(Name[] in) throws Exception {
+			Field f = Name.class.getField("$isGenerated");
+			
+			int count = 0;
+			for (int i = 0; i < in.length; i++) {
+				if (in[i] == null || !((Boolean)f.get(in[i])).booleanValue()) count++;
+			}
+			if (count == in.length) return in;
+			Name[] newNames = new Name[count];
+			count = 0;
+			for (int i = 0; i < in.length; i++) {
+				if (in[i] == null || !((Boolean)f.get(in[i])).booleanValue()) newNames[count++] = in[i];
+			}
+			return newNames;
+		}
+		
 		public static Annotation[] convertAnnotations(Annotation[] out, IAnnotatable annotatable) {
 			IAnnotation[] in;