Fix some qualified type relevances

It wasn't counting qualified types in case statements as qualified,
for instance.

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java

@@ -1197,9 +1197,9 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 						boolean isTypeInVariableDeclaration = isTypeInVariableDeclaration(context);
 						SwitchCase switchCase = (SwitchCase)DOMCompletionUtil.findParent(this.toComplete, new int[] { ASTNode.SWITCH_CASE });
 
+						this.qualifyingType = qualifierTypeBinding;
 						processMembers(qualifiedName, qualifierTypeBinding, specificCompletionBindings, true);
 						if (this.extendsOrImplementsInfo == null && !isTypeInVariableDeclaration && switchCase == null) {
-							this.qualifyingType = qualifierTypeBinding;
 							publishFromScope(specificCompletionBindings);
 						} else if (switchCase != null) {
 							ITypeBinding switchBinding = null;
@@ -1230,7 +1230,7 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 									.map(binding -> toProposal(binding))
 									.map(proposal -> {
 										if (proposal.getKind() == CompletionProposal.FIELD_REF) {
-											proposal.setRelevance(proposal.getRelevance() + RelevanceConstants.R_FINAL + RelevanceConstants.R_QUALIFIED);
+											proposal.setRelevance(proposal.getRelevance() + RelevanceConstants.R_FINAL);
 										}
 										return proposal;
 									})

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/codeassist/RelevanceUtils.java

@@ -32,15 +32,15 @@
 
 /**
  * Helper methods for calculating the relevance numbers of completion proposals.
- * 
+ *
  * Most of these are adapted from {@link CompletionEngine}
  */
 class RelevanceUtils {
-	
+
 	/**
 	 * Returns the sum of the appropriate relevance constants based on how the
 	 * current name matches the given proposal name according to the enabled rules.
-	 * 
+	 *
 	 * @param token        the uncompleted content
 	 * @param proposalName the proposal text to check against the uncompleted
 	 *                     content
@@ -67,15 +67,22 @@ public static int computeRelevanceForCaseMatching(char[] token, char[] proposalN
 		}
 		return 0;
 	}
-	
+
 	/**
-	 * Returns the appropriate "qualified" relevance constant based on if the current content is qualified and if the content is expected to be qualified.
-	 * 
-	 * @param prefixRequired true if the current completion item should be qualified, false otherwise
-	 * @param prefix the completion prefix; the java identifier that completion was triggered on
-	 * @param qualifiedPrefix the completion prefix with any qualifiers (eg. package qualifiers, type qualifiers, nested member access, etc.). May contain `.`
+	 * Returns the appropriate "qualified" relevance constant based on if the
+	 * current content is qualified and if the content is expected to be qualified.
+	 *
+	 * @param prefixRequired  true if the current completion item should be
+	 *                        qualified, false otherwise
+	 * @param prefix          the completion prefix; the java identifier that
+	 *                        completion was triggered on
+	 * @param qualifiedPrefix the completion prefix with any qualifiers (eg. package
+	 *                        qualifiers, type qualifiers, nested member access,
+	 *                        etc.). May contain `.`
 	 * @see CompletionEngine#computeRelevanceForQualification(boolean)
-	 * @return the appropriate "qualified" relevance constant based on if the current content is qualified and if the content is expected to be qualified
+	 * @return the appropriate "qualified" relevance constant based on if the
+	 *         current content is qualified and if the content is expected to be
+	 *         qualified
 	 */
 	static int computeRelevanceForQualification(boolean prefixRequired, String prefix, String qualifiedPrefix) {
 		boolean insideQualifiedReference = !prefix.equals(qualifiedPrefix);
@@ -87,49 +94,56 @@ static int computeRelevanceForQualification(boolean prefixRequired, String prefi
 		}
 		return 0;
 	}
-	
+
 	/**
-	 * Returns the appropriate relevance constant based on if type associated with the proposal matches the expected types.
-	 * 
-	 * @param proposalType the binding of the type associated with the proposal
+	 * Returns the appropriate relevance constant based on if type associated with
+	 * the proposal matches the expected types.
+	 *
+	 * @param proposalType  the binding of the type associated with the proposal
 	 * @param expectedTypes the expected types
-	 * @return the appropriate relevance constant based on if type associated with the proposal matches the expected types
+	 * @return the appropriate relevance constant based on if type associated with
+	 *         the proposal matches the expected types
 	 */
 	static int computeRelevanceForExpectingType(ITypeBinding proposalType, ExpectedTypes expectedTypes) {
 		if (proposalType != null) {
 			int relevance = 0;
 			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=271296
-			// If there is at least one expected type, then void proposal types attract a degraded relevance.
-			if (!expectedTypes.getExpectedTypes().isEmpty() && PrimitiveType.VOID.toString().equals(proposalType.getName())) {
+			// If there is at least one expected type, then void proposal types attract a
+			// degraded relevance.
+			if (!expectedTypes.getExpectedTypes().isEmpty()
+					&& PrimitiveType.VOID.toString().equals(proposalType.getName())) {
 				return RelevanceConstants.R_VOID;
 			}
 			for (ITypeBinding expectedType : expectedTypes.getExpectedTypes()) {
-				if(expectedTypes.allowsSubtypes()
+				if (expectedTypes.allowsSubtypes()
 						&& proposalType.getErasure().isSubTypeCompatible(expectedType.getErasure())) {
 
-					if(Objects.equals(expectedType.getQualifiedName(), proposalType.getQualifiedName())) {
+					if (Objects.equals(expectedType.getQualifiedName(), proposalType.getQualifiedName())) {
 						return RelevanceConstants.R_EXACT_EXPECTED_TYPE;
 					} else if (proposalType.getPackage() != null && proposalType.getPackage().isUnnamed()) {
 						return RelevanceConstants.R_PACKAGE_EXPECTED_TYPE;
 					}
 					relevance = RelevanceConstants.R_EXPECTED_TYPE;
 
 				}
-				if(expectedTypes.allowsSupertypes() && expectedType.isSubTypeCompatible(proposalType)) {
+				if (expectedTypes.allowsSupertypes() && expectedType.isSubTypeCompatible(proposalType)) {
 
-					if(Objects.equals(expectedType.getQualifiedName(), proposalType.getQualifiedName())) {
+					if (Objects.equals(expectedType.getQualifiedName(), proposalType.getQualifiedName())) {
 						return RelevanceConstants.R_EXACT_EXPECTED_TYPE;
 					}
 					relevance = RelevanceConstants.R_EXPECTED_TYPE;
 				}
-				// Bug 84720 - [1.5][assist] proposal ranking by return value should consider auto(un)boxing
-				// Just ensuring that the unitScope is not null, even though it's an unlikely case.
+				// Bug 84720 - [1.5][assist] proposal ranking by return value should consider
+				// auto(un)boxing
+				// Just ensuring that the unitScope is not null, even though it's an unlikely
+				// case.
 				var oneErasure = expectedType.getErasure();
 				var otherErasure = proposalType.getErasure();
-				if ((oneErasure.isPrimitive() && otherErasure.getQualifiedName().startsWith("java.lang.")) || 
-					(otherErasure.isPrimitive() && oneErasure.getQualifiedName().startsWith("java.lang."))) {
-					if (oneErasure.getName().equalsIgnoreCase(otherErasure.getName()) ||
-						Set.of(oneErasure.getName().toLowerCase(), otherErasure.getName().toLowerCase()).equals(Set.of("char", "character"))) {
+				if ((oneErasure.isPrimitive() && otherErasure.getQualifiedName().startsWith("java.lang."))
+						|| (otherErasure.isPrimitive() && oneErasure.getQualifiedName().startsWith("java.lang."))) {
+					if (oneErasure.getName().equalsIgnoreCase(otherErasure.getName())
+							|| Set.of(oneErasure.getName().toLowerCase(), otherErasure.getName().toLowerCase())
+									.equals(Set.of("char", "character"))) {
 						relevance = CompletionEngine.R_EXPECTED_TYPE;
 					}
 				}
@@ -142,40 +156,49 @@ static int computeRelevanceForExpectingType(ITypeBinding proposalType, ExpectedT
 		}
 		return 0;
 	}
-	
-	static int computeRelevanceForExpectingType(IType proposalType, ExpectedTypes expectedTypes, WorkingCopyOwner workingCopyOwner, Map<String, ITypeHierarchy> typeHierarchyCache) {
+
+	static int computeRelevanceForExpectingType(IType proposalType, ExpectedTypes expectedTypes,
+			WorkingCopyOwner workingCopyOwner, Map<String, ITypeHierarchy> typeHierarchyCache) {
 		if (proposalType != null) {
-			IPackageFragment packageFragment = (IPackageFragment)proposalType.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
+			IPackageFragment packageFragment = (IPackageFragment) proposalType
+					.getAncestor(IJavaElement.PACKAGE_FRAGMENT);
 			int relevance = 0;
 			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=271296
-			// If there is at least one expected type, then void proposal types attract a degraded relevance.
-			if (!expectedTypes.getExpectedTypes().isEmpty() && PrimitiveType.VOID.toString().equals(proposalType.getElementName())) {
+			// If there is at least one expected type, then void proposal types attract a
+			// degraded relevance.
+			if (!expectedTypes.getExpectedTypes().isEmpty()
+					&& PrimitiveType.VOID.toString().equals(proposalType.getElementName())) {
 				return RelevanceConstants.R_VOID;
 			}
 			for (ITypeBinding expectedType : expectedTypes.getExpectedTypes()) {
-				if(expectedTypes.allowsSubtypes()
-						&& DOMCompletionUtil.findInSupers(proposalType, expectedType.getKey(), workingCopyOwner, typeHierarchyCache)) {
+				if (expectedTypes.allowsSubtypes() && DOMCompletionUtil.findInSupers(proposalType,
+						expectedType.getKey(), workingCopyOwner, typeHierarchyCache)) {
 					if (expectedType.getKey().equals(proposalType.getKey())) {
 						return RelevanceConstants.R_EXACT_EXPECTED_TYPE;
-						// ??? I'm just guessing on the default packages name here, it might be the empty string
+						// ??? I'm just guessing on the default packages name here, it might be the
+						// empty string
 					} else if (packageFragment != null && packageFragment.getElementName().equals("<default>")) {
 						return RelevanceConstants.R_PACKAGE_EXPECTED_TYPE;
 					}
 					relevance = RelevanceConstants.R_EXPECTED_TYPE;
 
 				}
-				if(expectedTypes.allowsSupertypes() && DOMCompletionUtil.findInSupers(expectedType, proposalType.getKey())) {
+				if (expectedTypes.allowsSupertypes()
+						&& DOMCompletionUtil.findInSupers(expectedType, proposalType.getKey())) {
 					if (expectedType.getKey().equals(proposalType.getKey())) {
 						return RelevanceConstants.R_EXACT_EXPECTED_TYPE;
 					}
 					relevance = RelevanceConstants.R_EXPECTED_TYPE;
 				}
-				// Bug 84720 - [1.5][assist] proposal ranking by return value should consider auto(un)boxing
-				// Just ensuring that the unitScope is not null, even though it's an unlikely case.
+				// Bug 84720 - [1.5][assist] proposal ranking by return value should consider
+				// auto(un)boxing
+				// Just ensuring that the unitScope is not null, even though it's an unlikely
+				// case.
 				var oneErasure = expectedType.getErasure();
 				if ((oneErasure.isPrimitive() && proposalType.getFullyQualifiedName().startsWith("java.lang."))) {
-					if (oneErasure.getName().equalsIgnoreCase(proposalType.getElementName()) ||
-						Set.of(oneErasure.getName().toLowerCase(), proposalType.getElementName().toLowerCase()).equals(Set.of("char", "character"))) {
+					if (oneErasure.getName().equalsIgnoreCase(proposalType.getElementName())
+							|| Set.of(oneErasure.getName().toLowerCase(), proposalType.getElementName().toLowerCase())
+									.equals(Set.of("char", "character"))) {
 						relevance = CompletionEngine.R_EXPECTED_TYPE;
 					}
 				}
@@ -184,27 +207,34 @@ static int computeRelevanceForExpectingType(IType proposalType, ExpectedTypes ex
 		}
 		return 0;
 	}
-	
+
 	/**
-	 * Returns the appropriate relevance based on if the given type is expected, without taking into account sub/super classes.
-	 * 
-	 * @param type the type completion to get the relevance of
+	 * Returns the appropriate relevance based on if the given type is expected,
+	 * without taking into account sub/super classes.
+	 *
+	 * @param type          the type completion to get the relevance of
 	 * @param expectedTypes the information on the expected type
-	 * @return the appropriate relevance based on if the given type is expected, without taking into account sub/super classes
+	 * @return the appropriate relevance based on if the given type is expected,
+	 *         without taking into account sub/super classes
 	 */
 	static int simpleComputeRelevanceForExpectingType(IType type, ExpectedTypes expectedTypes) {
-		return (expectedTypes.getExpectedTypes().stream().map(ITypeBinding::getQualifiedName).anyMatch(type.getFullyQualifiedName()::equals) ? RelevanceConstants.R_EXACT_EXPECTED_TYPE :
-			expectedTypes.getExpectedTypes().stream().map(ITypeBinding::getQualifiedName).anyMatch(Object.class.getName()::equals) ? RelevanceConstants.R_EXPECTED_TYPE :
-			0);
+		return (expectedTypes.getExpectedTypes().stream().map(ITypeBinding::getQualifiedName)
+				.anyMatch(type.getFullyQualifiedName()::equals) ? RelevanceConstants.R_EXACT_EXPECTED_TYPE
+						: expectedTypes.getExpectedTypes().stream().map(ITypeBinding::getQualifiedName)
+								.anyMatch(Object.class.getName()::equals) ? RelevanceConstants.R_EXPECTED_TYPE : 0);
 	}
 
 	/**
-	 * Returns the appropriate relevance number based on if the given member is directly implemented in the qualifying type.
-	 * 
-	 * @see CompletionEngine#computeRelevanceForInheritance(ReferenceBinding, ReferenceBinding)
+	 * Returns the appropriate relevance number based on if the given member is
+	 * directly implemented in the qualifying type.
+	 *
+	 * @see CompletionEngine#computeRelevanceForInheritance(ReferenceBinding,
+	 *      ReferenceBinding)
 	 * @param qualifyingType the qualifying type
-	 * @param member the member to check if it's directly or indirectly inherited
-	 * @return the appropriate relevance number based on if the given member is directly implemented in the qualifying type
+	 * @param member         the member to check if it's directly or indirectly
+	 *                       inherited
+	 * @return the appropriate relevance number based on if the given member is
+	 *         directly implemented in the qualifying type
 	 */
 	static int computeRelevanceForInheritance(ITypeBinding qualifyingType, IBinding member) {
 		if (qualifyingType == null) {
@@ -225,14 +255,18 @@ static int computeRelevanceForInheritance(ITypeBinding qualifyingType, IBinding
 		}
 		return 0;
 	}
-	
+
 	/**
-	 * Returns the appropriate relevance number based on if the given member type is directly implemented in the qualifying type.
-	 * 
-	 * @see CompletionEngine#computeRelevanceForInheritance(ReferenceBinding, ReferenceBinding)
+	 * Returns the appropriate relevance number based on if the given member type is
+	 * directly implemented in the qualifying type.
+	 *
+	 * @see CompletionEngine#computeRelevanceForInheritance(ReferenceBinding,
+	 *      ReferenceBinding)
 	 * @param qualifyingType the qualifying type
-	 * @param memberType the member type to check if it's directly or indirectly inherited
-	 * @return the appropriate relevance number based on if the given member is directly implemented in the qualifying type
+	 * @param memberType     the member type to check if it's directly or indirectly
+	 *                       inherited
+	 * @return the appropriate relevance number based on if the given member is
+	 *         directly implemented in the qualifying type
 	 */
 	static int computeRelevanceForInheritance(ITypeBinding qualifyingType, IType memberType) {
 		if (qualifyingType == null || memberType.getDeclaringType() == null) {
@@ -243,7 +277,7 @@ static int computeRelevanceForInheritance(ITypeBinding qualifyingType, IType mem
 		}
 		return 0;
 	}
-	
+
 	static int computeRelevanceForInteresting(IType potentiallyInterestingType, ExpectedTypes expectedTypes) {
 		String typeKey = potentiallyInterestingType.getKey();
 		for (ITypeBinding uninterestingType : expectedTypes.getUninterestingTypes()) {
@@ -255,13 +289,14 @@ static int computeRelevanceForInteresting(IType potentiallyInterestingType, Expe
 	}
 
 	/**
-	 * Returns the appropriate relevance number based on the access rule, taking into account if access warnings/errors are disabled.
+	 * Returns the appropriate relevance number based on the access rule, taking
+	 * into account if access warnings/errors are disabled.
 	 *
-	 * i.e. if the errors for accessing an inaccessible class are disabled,
-	 * the relevance number is the same as if there are no access restrictions.
+	 * i.e. if the errors for accessing an inaccessible class are disabled, the
+	 * relevance number is the same as if there are no access restrictions.
 	 *
 	 * @param accessRuleKind the access rule
-	 * @param settings the compiler settings
+	 * @param settings       the compiler settings
 	 * @return the appropriate relevance number
 	 */
 	static int computeRelevanceForRestrictions(int accessRuleKind, Map<String, String> settings) {