[fixes #3373] Find references for extension methods

Author: Rawi01

src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java

@@ -918,6 +918,13 @@ private static void patchExtensionMethod(ScriptManager sm) {
 .request(StackRequest.THIS)
 .wrapMethod(new Hook(PATCH_EXTENSIONMETHOD_COMPLETIONPROPOSAL_PORTAL, "getJavaCompletionProposals", I_JAVA_COMPLETION_PROPOSAL_SIG, "java.lang.Object[]", "java.lang.Object"))
 .build());
+
+sm.addScriptIfWitness(OSGI_TYPES, ScriptBuilder.wrapReturnValue()
+.target(new MethodTarget("org.eclipse.jdt.core.search.SearchPattern", "createPattern", "org.eclipse.jdt.core.search.SearchPattern", "org.eclipse.jdt.core.IJavaElement", "int", "int"))
+.wrapMethod(new Hook(PATCH_EXTENSIONMETHOD, "modifyMethodPattern", "java.lang.Object", "java.lang.Object"))
+.cast()
+.request(StackRequest.RETURN_VALUE)
+.build());
 }
 
 private static void patchNullCheck(ScriptManager sm) {

src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java

@@ -43,6 +43,7 @@
 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;
@@ -66,6 +67,7 @@
 import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
 import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
 import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
+import org.eclipse.jdt.internal.core.search.matching.MethodPattern;
 
 public class PatchExtensionMethod {
 static class Extension {
@@ -378,6 +380,17 @@ public static TypeBinding resolveType(TypeBinding resolvedType, MessageSend meth
 MessageSend_postponedErrors.clear(methodCall);
 return resolvedType;
 }
+
+public static SearchPattern modifyMethodPattern(SearchPattern original) {
+if (original != null && original instanceof MethodPattern) {
+MethodPattern methodPattern = (MethodPattern) original;
+if (methodPattern.parameterCount > 0) {
+methodPattern.varargs = true;
+}
+}
+
+return original;
+}
 
 private static boolean requiresPolyBinding(Expression argument) {
 return Reflection.isFunctionalExpression(argument) || argument instanceof ConditionalExpression && Reflection.isPolyExpression(argument);

src/eclipseAgent/lombok/launch/PatchFixesHider.java

@@ -344,6 +344,7 @@ public static final class ExtensionMethod {
 private static final Method ERROR_NO_METHOD_FOR;
 private static final Method INVALID_METHOD, INVALID_METHOD2;
 private static final Method NON_STATIC_ACCESS_TO_STATIC_METHOD;
+private static final Method MODIFY_METHOD_PATTERN;
 
 static {
 Class<?> shadowed = Util.shadowLoadClass("lombok.eclipse.agent.PatchExtensionMethod");
@@ -352,6 +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");
 }
 
 public static Object resolveType(Object resolvedType, Object methodCall, Object scope) {
@@ -373,6 +375,10 @@ public static void invalidMethod(Object problemReporter, Object messageSend, Obj
 public static void nonStaticAccessToStaticMethod(Object problemReporter, Object location, Object method, Object messageSend) {
 Util.invokeMethod(NON_STATIC_ACCESS_TO_STATIC_METHOD, problemReporter, location, method, messageSend);
 }
+
+public static Object modifyMethodPattern(Object original) {
+return Util.invokeMethod(MODIFY_METHOD_PATTERN, original);
+}
 }
 
 /** Contains patch code to support Javadoc for generated methods */

test/eclipse/resource/findreferences/extensionMethod/Extension.java

@@ -0,0 +1,15 @@
+package pkg;
+
+public static class Extension {
+public static String test(String s) {
+return s;
+}
+
+public static String test(String s, int i) {
+return s;
+}
+
+public static String test(String s, String... s2) {
+return s;
+}
+}

test/eclipse/resource/findreferences/extensionMethod/Usage.java

@@ -0,0 +1,13 @@
+package pkg;
+
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(Extension.class)
+public class Usage {
+public void test() {
+private String string;
+string.test();
+string.test("a");
+string.test(1);
+}
+}

test/eclipse/resource/rename/extensionMethod/after/Extension.java

@@ -0,0 +1,15 @@
+package pkg;
+
+public static class Extension {
+public static String newTest(String s) {
+return s;
+}
+
+public static String test(String s, int i) {
+return s;
+}
+
+public static String test(String s, String... s2) {
+return s;
+}
+}

test/eclipse/resource/rename/extensionMethod/after/Usage.java

@@ -0,0 +1,13 @@
+package pkg;
+
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(Extension.class)
+public class Usage {
+public void test() {
+private String string;
+string.newTest();
+string.test("a");
+string.test(1);
+}
+}

test/eclipse/resource/rename/extensionMethod/before/Extension.java

@@ -0,0 +1,15 @@
+package pkg;
+
+public static class Extension {
+public static String test(String s) {
+return s;
+}
+
+public static String test(String s, int i) {
+return s;
+}
+
+public static String test(String s, String... s2) {
+return s;
+}
+}

test/eclipse/resource/rename/extensionMethod/before/Usage.java

@@ -0,0 +1,13 @@
+package pkg;
+
+import lombok.experimental.ExtensionMethod;
+
+@ExtensionMethod(Extension.class)
+public class Usage {
+public void test() {
+private String string;
+string.test();
+string.test("a");
+string.test(1);
+}
+}

test/eclipse/src/lombok/eclipse/EclipseTests.java

@@ -8,9 +8,10 @@
 import lombok.eclipse.edit.SelectTest;
 import lombok.eclipse.refactoring.ExtractInterfaceTest;
 import lombok.eclipse.refactoring.RenameTest;
+import lombok.eclipse.references.FindReferencesTest;
 
 @RunWith(Suite.class)
-@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class})
+@SuiteClasses({ExtractInterfaceTest.class, RenameTest.class, SelectTest.class, CleanupTest.class, FindReferencesTest.class})
 public class EclipseTests {
 
 }