Remove eclipse specific classes in ExtensionMethod patch signatures

Rawi01 · rspilker · commit 3f51b25ac99f · 2023-04-14T21:55:28.000+02:00
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java b/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
@@ -43,7 +43,6 @@
 import lombok.experimental.ExtensionMethod;
 import lombok.permit.Permit;
 
-import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.internal.compiler.ast.ASTNode;
 import org.eclipse.jdt.internal.compiler.ast.Annotation;
 import org.eclipse.jdt.internal.compiler.ast.ClassLiteralAccess;
@@ -381,7 +380,7 @@ public static TypeBinding resolveType(TypeBinding resolvedType, MessageSend meth
 		return resolvedType;
 	}
 	
-	public static SearchPattern modifyMethodPattern(SearchPattern original) {
+	public static Object modifyMethodPattern(Object original) {
 		if (original != null && original instanceof MethodPattern) {
 			MethodPattern methodPattern = (MethodPattern) original;
 			if (methodPattern.parameterCount > 0) {
diff --git a/src/eclipseAgent/lombok/launch/PatchFixesHider.java b/src/eclipseAgent/lombok/launch/PatchFixesHider.java
@@ -353,7 +353,7 @@ public static final class ExtensionMethod {
 			INVALID_METHOD = Util.findMethod(shadowed, "invalidMethod", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG);
 			INVALID_METHOD2 = Util.findMethod(shadowed, "invalidMethod", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG, SCOPE_SIG);
 			NON_STATIC_ACCESS_TO_STATIC_METHOD = Util.findMethod(shadowed, "nonStaticAccessToStaticMethod", PROBLEM_REPORTER_SIG, AST_NODE_SIG, METHOD_BINDING_SIG, MESSAGE_SEND_SIG);
-			MODIFY_METHOD_PATTERN = Util.findMethod(shadowed, "modifyMethodPattern", "org.eclipse.jdt.core.search.SearchPattern");
+			MODIFY_METHOD_PATTERN = Util.findMethod(shadowed, "modifyMethodPattern", Object.class);
 		}
 		
 		public static Object resolveType(Object resolvedType, Object methodCall, Object scope) {

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ public static final class ExtensionMethod {`
`353`	`353`	`INVALID_METHOD = Util.findMethod(shadowed, "invalidMethod", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG);`
`354`	`354`	`INVALID_METHOD2 = Util.findMethod(shadowed, "invalidMethod", PROBLEM_REPORTER_SIG, MESSAGE_SEND_SIG, METHOD_BINDING_SIG, SCOPE_SIG);`
`355`	`355`	`NON_STATIC_ACCESS_TO_STATIC_METHOD = Util.findMethod(shadowed, "nonStaticAccessToStaticMethod", PROBLEM_REPORTER_SIG, AST_NODE_SIG, METHOD_BINDING_SIG, MESSAGE_SEND_SIG);`
`356`		`- MODIFY_METHOD_PATTERN = Util.findMethod(shadowed, "modifyMethodPattern", "org.eclipse.jdt.core.search.SearchPattern");`
	`356`	`+ MODIFY_METHOD_PATTERN = Util.findMethod(shadowed, "modifyMethodPattern", Object.class);`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`public static Object resolveType(Object resolvedType, Object methodCall, Object scope) {`