Fix type parameters coloring corner cases (#1073 #1074) (#1296)

Missing coloring for class / interface from other compilation unit. Applied coloring to labels outside of diamond brackets.
eclipse-jdt · Apr 3, 2024 · a0babe0 · a0babe0
1 parent fef727f
commit a0babe0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/...ation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelComposerCore.java b/...ation/common/org/eclipse/jdt/internal/core/manipulation/JavaElementLabelComposerCore.java
@@ -904,19 +904,28 @@ protected void appendTypeParameterSignaturesLabel(String[] typeParamSigs, long f
 				if (i > 0) {
 					fBuffer.append(JavaElementLabelsCore.COMMA_STRING);
 				}
-				fBuffer.append(Signature.getTypeVariable(typeParamSigs[i]));
+				appendTypeParameteSignatureLabel(Signature.getTypeVariable(typeParamSigs[i]));
 			}
 			appendGT();
 		}
 	}
 
+	/**
+	 * Appends label for single type parameter from a signature.
+	 *
+	 * @param typeVariableName the type variable name
+	 */
+	protected void appendTypeParameteSignatureLabel(String typeVariableName) {
+		fBuffer.append(typeVariableName);
+	}
+
 	/**
 	 * Appends the string for rendering the '<code>&lt;</code>' character.
 	 */
 	protected void appendLT() {
 		fBuffer.append(getLT());
 	}
-	
+
 	/**
 	 * Returns the string for rendering the '<code>&lt;</code>' character.
 	 *
@@ -932,7 +941,7 @@ protected String getLT() {
 	protected void appendGT() {
 		fBuffer.append(getGT());
 	}
-	
+
 	/**
 	 * Returns the string for rendering the '<code>&gt;</code>' character.
 	 *

diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/JavaElementLinks.java
@@ -451,7 +451,7 @@ protected void appendMethodParamName(String name) {
 
 		@Override
 		protected void appendTypeParameterWithBounds(ITypeParameter typeParameter, long flags) throws JavaModelException {
-			if (noEnhancements) {
+			if (noEnhancements || nextNestingLevel == 1) {
 				super.appendTypeParameterWithBounds(typeParameter, flags);
 			} else {
 				fBuffer.append("<span class='"); //$NON-NLS-1$
@@ -495,6 +495,11 @@ protected void appendTypeArgumentSignaturesLabel(IJavaElement enclosingElement,
 				super.appendTypeArgumentSignaturesLabel(enclosingElement, typeArgsSig, flags);
 			}
 		}
+
+		@Override
+		protected void appendTypeParameteSignatureLabel(String typeVariableName) {
+			super.appendTypeParameteSignatureLabel(wrapWithTypeClass(typeVariableName, typeVariableName));
+		}
 	}
 
 	public static final String OPEN_LINK_SCHEME= CoreJavaElementLinks.OPEN_LINK_SCHEME;