Improve logic for 'inheritance' part of completion relevance

It's now taken into account for members of a qualified type being completed.

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

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

@@ -893,8 +893,12 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 					IBinding qualifiedNameBinding = qualifiedName.getQualifier().resolveBinding();
 					ExtendsOrImplementsInfo info = isInExtendsOrImplements(qualifiedName);
 					if (qualifiedNameBinding instanceof ITypeBinding qualifierTypeBinding && !qualifierTypeBinding.isRecovered()) {
+
+						boolean isTypeInVariableDeclaration = isTypeInVariableDeclaration(context);
+
 						processMembers(qualifiedName, qualifierTypeBinding, specificCompletionBindings, true);
-						if (info == null) {
+						if (info == null && !isTypeInVariableDeclaration) {
+							this.qualifyingType = qualifierTypeBinding;
 							publishFromScope(specificCompletionBindings);
 						} else {
 							specificCompletionBindings.all() //
@@ -1522,6 +1526,26 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 			}
 		}
 	}
+	
+	private boolean isTypeInVariableDeclaration(ASTNode context) {
+		ASTNode cursor = context.getParent();
+		ASTNode childCursor = context;
+		while (cursor != null
+				&& !(cursor instanceof FieldDeclaration)
+				&& !(cursor instanceof VariableDeclarationStatement)
+				&& !(cursor instanceof SingleVariableDeclaration)) {
+			childCursor = cursor;
+			cursor = cursor.getParent();
+		}
+		if (cursor instanceof FieldDeclaration fieldDecl) {
+			return fieldDecl.getType() == childCursor;
+		} else if (cursor instanceof VariableDeclarationStatement varDecl) {
+			return varDecl.getType() == childCursor;
+		} else if (cursor instanceof SingleVariableDeclaration varDecl) {
+			return varDecl.getType() == childCursor;
+		}
+		return false;
+	}
 
 	private void suggestSuperConstructors() {
 		if (this.requestor.isIgnored(CompletionProposal.METHOD_REF) || this.requestor.isIgnored(CompletionProposal.CONSTRUCTOR_INVOCATION)) {
@@ -2680,7 +2704,6 @@ private CompletionProposal toProposal(IBinding binding, String completion) {
 				RelevanceConstants.R_NON_RESTRICTED +
 				RelevanceUtils.computeRelevanceForInheritance(this.qualifyingType, binding) +
 				((insideQualifiedReference() && !staticOnly() && !Modifier.isStatic(binding.getModifiers())) || (inJavadoc && !res.isConstructor()) ? RelevanceConstants.R_NON_STATIC : 0) +
-				(!staticOnly() || inheritedValue ? 0 : RelevanceConstants.R_NON_INHERITED) + // TODO: when is this active?
 				(binding instanceof IVariableBinding field && field.isEnumConstant() ? RelevanceConstants.R_ENUM + RelevanceConstants.R_ENUM_CONSTANT : 0)
 				);
 		if (res.getRequiredProposals() != null) {

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

@@ -299,7 +299,7 @@ public static void main(String... args) {
 		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
 		IProgressMonitor monitor = new NullProgressMonitor();
 		this.workingCopies[0].codeComplete(cursorLocation, requestor, WC_OWNER, monitor);
-		assertTrue(requestor.getResults().contains("out[FIELD_REF]{out, Ljava.lang.System;, Ljava.io.PrintStream;, out, [78, 78], 49}"));
+		assertTrue(requestor.getResults().contains("out[FIELD_REF]{out, Ljava.lang.System;, Ljava.io.PrintStream;, out, [78, 78], 51}"));
 	}
 
 }