[WIP] fix ExternalAnnotations18Test.testAnnotateMethodTypeParameter2

Signed-off-by: David Thompson <[email protected]>
robstryker · Apr 19, 2024 · 62fa919 · 62fa919
1 parent b1447fd
commit 62fa919
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacMethodBinding.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacMethodBinding.java
@@ -134,8 +134,7 @@ static void getKey(StringBuilder builder, MethodSymbol methodSymbol, JavacBindin
 			ownerSymbol = ownerSymbol.owner;
 		}
 		if (ownerSymbol instanceof TypeSymbol ownerTypeSymbol) {
-			ITypeBinding ownerTypeBinding = new JavacTypeBinding(ownerTypeSymbol, resolver, null);
-			builder.append(ownerTypeBinding.getKey());
+			JavacTypeBinding.getKey(builder, ownerTypeSymbol.type, false, true);
 		} else {
 			throw new IllegalArgumentException("Method has no owning class");
 		}
@@ -146,7 +145,7 @@ static void getKey(StringBuilder builder, MethodSymbol methodSymbol, JavacBindin
 		if (!methodSymbol.getTypeParameters().isEmpty()) {
 			builder.append('<');
 			for (var typeParam : methodSymbol.getTypeParameters()) {
-				JavacTypeVariableBinding typeVarBinding = new JavacTypeVariableBinding(typeParam, resolver);
+				JavacTypeVariableBinding typeVarBinding = new JavacTypeVariableBinding(typeParam);
 				builder.append(typeVarBinding.getKey());
 			}
 			builder.append('>');

diff --git a/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java b/org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeBinding.java
@@ -114,7 +114,7 @@ public String getKey() {
 		return builder.toString();
 	}
 
-	static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf) {
+	static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf, boolean erased) {
 		if (typeToBuild instanceof ArrayType arrayType) {
 			builder.append('[');
 			getKey(builder, arrayType.elemtype, isLeaf);
@@ -141,7 +141,7 @@ static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf) {
 				}
 			}
 			builder.append(typeToBuild.asElement().getQualifiedName().toString().replace('.', '/'));
-			if (typeToBuild.isParameterized()) {
+			if (typeToBuild.isParameterized() && !erased) {
 				builder.append('<');
 				for (var typeArgument : typeToBuild.getTypeArguments()) {
 					getKey(builder, typeArgument, false);
@@ -156,6 +156,10 @@ static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf) {
 		throw new UnsupportedOperationException("Unimplemented method 'getKey'");
 	}
 
+	static void getKey(StringBuilder builder, Type typeToBuild, boolean isLeaf) {
+		getKey(builder, typeToBuild, isLeaf, false);
+	}
+
 	@Override
 	public boolean isEqualTo(final IBinding binding) {
 		return binding instanceof final JavacTypeBinding other && //

diff --git a/...lipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeVariableBinding.java b/...lipse.jdt.core.javac/src/org/eclipse/jdt/internal/javac/dom/JavacTypeVariableBinding.java
@@ -1,7 +1,5 @@
 package org.eclipse.jdt.internal.javac.dom;
 
-import org.eclipse.jdt.core.dom.JavacBindingResolver;
-
 import com.sun.tools.javac.code.Symbol.TypeVariableSymbol;
 
 /**
@@ -10,20 +8,22 @@
  */
 class JavacTypeVariableBinding {
 	private TypeVariableSymbol typeVar;
-	private JavacBindingResolver resolver;
 
-	JavacTypeVariableBinding(TypeVariableSymbol typeVar, JavacBindingResolver resolver) {
+	JavacTypeVariableBinding(TypeVariableSymbol typeVar) {
 		this.typeVar = typeVar;
-		this.resolver = resolver;
 	}
 
 	public String getKey() {
 		StringBuilder builder = new StringBuilder();
 		builder.append(typeVar.getSimpleName());
 		builder.append(':');
+		boolean prependColon = typeVar.getBounds().size() > 1
+				|| (typeVar.getBounds().size() > 0 && typeVar.getBounds().get(0).isInterface());
 		for (var bound : typeVar.getBounds()) {
-			JavacTypeBinding boundTypeBinding = new JavacTypeBinding(bound.tsym, this.resolver, null);
-			builder.append(boundTypeBinding.getKey());
+			if (prependColon) {
+				builder.append(":");
+			}
+			JavacTypeBinding.getKey(builder, bound, false);
 		}
 		return builder.toString();
 	}