Fix key for wildcard/extends type

If there is no bound on the WildcardType, should be `+Lextended/Type` or
`-Lsuper/Type`
If a bound is set on the wildcardType, should be
`Ldeclaring/Type;{#rank};+Lextended/Type;`

Fixes #1836

Author: mickaelistria

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacMethodBinding.java

@@ -448,7 +448,7 @@ static void getKey(StringBuilder builder, MethodSymbol methodSymbol, ExecutableT
 
 		if (parentType != null) {
 			JavacTypeBinding parentBinding = resolver.bindings.getTypeBinding(parentType);
-			String parentKey = parentBinding.getKey(true, true);
+			String parentKey = parentBinding.getKeyWithPossibleGenerics(parentType, parentType.tsym);
 			builder.append(parentKey);
 		} else {
 			Symbol ownerSymbol = methodSymbol.owner;

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java

@@ -456,10 +456,7 @@ private String computeKey() {
 		return b3;
 	}
 	public String getKeyWithPossibleGenerics(Type t, TypeSymbol s) {
-		return getKeyWithPossibleGenerics(t, s, tb -> tb != null ? tb.getKey() : KeyUtils.OBJECT_KEY);
-	}
-	private String getKeyWithPossibleGenerics(Type t, TypeSymbol s, Function<ITypeBinding, String> parameterizedCallback) {
-		return getKeyWithPossibleGenerics(t, s, parameterizedCallback, false);
+		return getKeyWithPossibleGenerics(t, s, tb -> tb != null ? tb.getKey() : KeyUtils.OBJECT_KEY, true);
 	}
 	private String getKeyWithPossibleGenerics(Type t, TypeSymbol s, Function<ITypeBinding, String> parameterizedCallback, boolean useSlashes) {
 		if( !this.isGeneric && this instanceof JavacTypeVariableBinding jctvb ) {
@@ -734,19 +731,8 @@ static void getKey(StringBuilder builder, Type typeToBuild, String n, boolean is
 			if ((b1 || b2) && includeParameters) {
 				builder.append('<');
 				for (var typeArgument : typeToBuild.getTypeArguments()) {
-					StringBuilder tmp = new StringBuilder();
-					getKey(tmp, typeArgument, typeArgument.asElement().flatName().toString(),
+					getKey(builder, typeArgument, typeArgument.asElement().flatName().toString(),
 							false, includeParameters, useSlashes, resolver);
-					String paramType = tmp.toString();
-					if( paramType.startsWith("+") && !paramType.equals("+Ljava/lang/Object;")) {
-						builder.append("!");
-						builder.append(currentTypeSignature);
-						builder.append(";{1}");// TODO
-						builder.append(paramType);
-						builder.append("1;");// TODO
-					} else {
-						builder.append(paramType);
-					}
 				}
 				builder.append('>');
 			}

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

@@ -93,4 +93,22 @@ public <E extends Exception> void m() throws E {
 		MethodDeclaration meth = (MethodDeclaration) NodeFinder.perform(node, source.indexOf("m()"), 0).getParent();
 		assertEquals("LA;.m<E:Ljava/lang/Exception;>()V|TE;", meth.resolveBinding().getKey());
 	}
-}
+
+	@Test
+	public void testInvalidSignatureDeepTypeParameter() throws Exception {
+		ASTParser parser = ASTParser.newParser(AST.getJLSLatest());
+		String source = """
+				interface A {
+					java.util.List<java.util.List<? extends String>> m();
+				}
+				""";
+		parser.setSource(source.toCharArray());
+		parser.setUnitName("A.java");
+		parser.setEnvironment(null, null, null, true);
+		parser.setResolveBindings(true);
+		ASTNode node = parser.createAST(new NullProgressMonitor());
+		MethodDeclaration meth = (MethodDeclaration) NodeFinder.perform(node, source.indexOf("m()"), 0).getParent();
+		assertEquals("LA;.m()Ljava/util/List<Ljava/util/List<+Ljava/lang/String;>;>;", meth.resolveBinding().getKey());
+	}
+
+}

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

@@ -254,7 +254,7 @@ public void testGetModelForTypeWithAnnotation() throws Exception {
 		IJavaProject javaProject = JavaCore.create(project);
 		IType type = javaProject.findType("test.FieldWithAnnotatedType");
 		IField theField = type.getFields()[0];
-		String s = theField.getTypeSignature();
+		theField.getTypeSignature(); // test no exception is thrown
 	}
 
 	static IProject importProject(String locationInBundle) throws URISyntaxException, IOException, CoreException {