Fix generating signatures from bindings

Author: mickaelistria

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/SignatureUtils.java

@@ -126,7 +126,7 @@ public static String getSignature(ITypeBinding typeBinding) {
 		    return Signature.C_EXTENDS + Stream.of(upper).map(SignatureUtils::getSignature).collect(Collectors.joining());
 		  }
 		  var lower = typeBinding.getWildcard();
-		  if (lower != null) {
+		  if (lower != null && lower != typeBinding) {
 		    return Signature.C_SUPER + SignatureUtils.getSignature(lower);
 		  }
 			// TODO if typeBinding.getBounds(): C_EXTENDS, C_SUPER
@@ -144,7 +144,10 @@ public static String getSignature(ITypeBinding typeBinding) {
 			res.deleteCharAt(res.length() - 1);
 			return res.toString()
 				+ Signature.C_GENERIC_START
-				+ Stream.of(typeBinding.getTypeArguments()).map(SignatureUtils::getSignature).collect(Collectors.joining())
+				+ Stream.of(typeBinding.getTypeArguments())
+						.map(SignatureUtils::getSignature)
+						.map(sig -> "+Ljava.lang.Object;".equals(sig) ? "*" : sig)
+						.collect(Collectors.joining())
 				+ Signature.C_GENERIC_END
 				+ Signature.C_NAME_END;
 		}
@@ -177,7 +180,11 @@ public static String getSignatureForTypeKey(String key) {
 	}
 
 	public static String getSignature(IMethodBinding methodBinding) {
-		return getSignatureForMethodKey(methodBinding.getKey());
+		return Signature.C_PARAM_START
+			+ Stream.of(methodBinding.getParameterTypes()).map(SignatureUtils::getSignature).collect(Collectors.joining())
+			+ Signature.C_PARAM_END
+			+ SignatureUtils.getSignature(methodBinding.getReturnType());
+			// exceptions? type params?
 	}
 
 	/**
@@ -187,7 +194,7 @@ public static String getSignature(IMethodBinding methodBinding) {
 	 * @return the signature of the given method binding as a character array
 	 */
 	public static char[] getSignatureChar(IMethodBinding methodBinding) {
-		return getSignatureForMethodKey(methodBinding.getKey()).toCharArray();
+		return getSignature(methodBinding).toCharArray();
 	}
 
 	public static char[] getSignatureChar(IMethod method) {
@@ -203,7 +210,7 @@ public static char[] getSignatureChar(IMethod method) {
 	public static String getSignatureForMethodKey(String key) {
 		String fullKey = key
 				.replace('/', '.')
-				.replace("<+Ljava.lang.Object;>", "<*>")
+				.replace("+Ljava.lang.Object;", "*")
 				.replace("<>;",  ";");
 		String removeName = fullKey.substring(fullKey.indexOf('('));
 		int firstException = removeName.indexOf('|');

org.eclipse.jdt.core.tests.javac/src/org/eclipse/jdt/core/tests/javac/RegressionTests.java

@@ -13,7 +13,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -227,18 +226,26 @@ public void testParameterCountWithCapture() throws Exception {
 			var modelMethod = (IMethod)domMethod.getJavaElement();
 			String signature = modelMethod.getSignature();
 			assertEquals(1, Signature.getParameterCount(signature));
-			CompletionProposal[] mapProposal = new CompletionProposal[] { null };
+			Set<CompletionProposal> invalidProposals = new HashSet<>();
 			unit.codeComplete(index + 1, new org.eclipse.jdt.core.CompletionRequestor() {
 				@Override
 				public void accept(CompletionProposal proposal) {
-					if (proposal.getCompletion() != null && Set.of("map" /* DOM first */, "map()" /* Legacy */).contains(new String(proposal.getCompletion()))) {
-						mapProposal[0] = proposal;
+					if (proposal.getKind() != CompletionProposal.METHOD_REF) {
+						return;
+					}
+					try {
+						Signature.toCharArray(proposal.getDeclarationSignature());
+					} catch (Exception ex) {
+						invalidProposals.add(proposal);
+					}
+					try {
+						Signature.toCharArray(proposal.getSignature());
+					} catch (Exception ex) {
+						invalidProposals.add(proposal);
 					}
 				}
 			});
-			assertNotNull(mapProposal[0]);
-			// ensure next line doesn't cause exception
-			Signature.toCharArray(mapProposal[0].getDeclarationSignature());
+			assertEquals(Set.of(), invalidProposals);
 		}
 	}