Assorted completion bug fixes

- Don't complete enum constant declarations
- Better handling of completion of qualified `super` and `this`
  (take into account if you're in an interface)
- Improve `JavacConverter` to handle "field access" split across two lines
  as in `CompletionTests.testBug573632`
  (signatures don't match properly so it's not passing)

Should fix 4 and improve many more

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

Author: datho7561

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/core/dom/JavacConverter.java

@@ -1270,6 +1270,11 @@ private Expression convertExpressionImpl(JCExpression javac) {
 					// when there are syntax errors where the statement is not completed.
 					qualifiedName = this.ast.newSimpleName(FAKE_IDENTIFIER);
 					qualifiedName.setFlags(ASTNode.RECOVERED);
+				} else {
+					int qualifiedOffset = this.rawText.indexOf(qualifiedName.toString(), qualifierName.getStartPosition() + qualifierName.getLength() + 1);
+					if (qualifiedOffset != -1) {
+						qualifiedName.setSourceRange(qualifiedOffset, qualifiedName.toString().length());
+					}
 				}
 				QualifiedName res = this.ast.newQualifiedName(qualifierName, qualifiedName);
 				commonSettings(res, javac);

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

@@ -86,6 +86,7 @@
 import org.eclipse.jdt.core.dom.ContinueStatement;
 import org.eclipse.jdt.core.dom.DoStatement;
 import org.eclipse.jdt.core.dom.EnhancedForStatement;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
 import org.eclipse.jdt.core.dom.EnumDeclaration;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.ExpressionMethodReference;
@@ -282,17 +283,7 @@ public Stream<CompletionProposal> toProposals() {
 		public Stream<CompletionProposal> toProposals(boolean expectedOnly) {
 
 			// Needed to tell if `this` should be used
-			List<ITypeBinding> parentTypeBinding = new ArrayList<>();
-			ASTNode cursor = DOMCompletionEngine.this.toComplete;
-			while (DOMCompletionUtils.findParentTypeDeclaration(cursor) != null) {
-				ASTNode parentTypeDeclaration = DOMCompletionUtils.findParentTypeDeclaration(cursor);
-				if (parentTypeDeclaration instanceof AbstractTypeDeclaration typeDecl) {
-					parentTypeBinding.add(typeDecl.resolveBinding());
-				} else {
-					parentTypeBinding.add(((AnonymousClassDeclaration)parentTypeDeclaration).resolveBinding());
-				}
-				cursor = parentTypeDeclaration.getParent();
-			}
+			List<ITypeBinding> parentTypeBinding = DOMCompletionUtils.getParentTypeDeclarations(DOMCompletionEngine.this.toComplete);
 
 			return all() //
 				.filter(binding -> pattern.matchesName(prefix.toCharArray(), binding.getName().toCharArray())) //
@@ -743,6 +734,7 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 						|| simpleName.getParent() instanceof ContinueStatement
 						|| simpleName.getParent() instanceof MarkerAnnotation
 						|| simpleName.getParent() instanceof AnnotationTypeMemberDeclaration
+						|| simpleName.getParent() instanceof EnumConstantDeclaration
 						|| ((simpleName.getLocationInParent() == SwitchCase.EXPRESSIONS2_PROPERTY || simpleName.getLocationInParent() == SwitchCase.EXPRESSION_PROPERTY) && simpleName.getParent() instanceof SwitchCase)) {
 					if (!this.toComplete.getLocationInParent().getId().equals(QualifiedName.QUALIFIER_PROPERTY.getId())) {
 						context = this.toComplete.getParent();
@@ -956,6 +948,8 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 			case SwitchCase _:
 				completeSwitchCase();
 				break;
+			case EnumConstantDeclaration _:
+				completeEnumConstantDeclaration();
 			default:
 				// Fall back to default completion strategy (accessible bindings + type search)
 			}
@@ -1084,6 +1078,10 @@ public void complete(org.eclipse.jdt.internal.compiler.env.ICompilationUnit sour
 		}
 	}
 
+	private void completeEnumConstantDeclaration() {
+		this.suggestDefaultCompletions = false;
+	}
+
 	private void completeSwitchCase() {
 		// find the enum if there is one
 		ITypeBinding firstEnumType = null;
@@ -2194,16 +2192,23 @@ private void completeQualifiedName(QualifiedName qualifiedName) throws JavaModel
 				}
 				if (!(this.toComplete instanceof Type)) {
 					ASTNode parentTypeDeclaration = DOMCompletionUtils.findParentTypeDeclaration(qualifiedName);
+					List<ITypeBinding> parentTypeDeclarations = DOMCompletionUtils.getParentTypeDeclarations(this.toComplete);
 					MethodDeclaration methodDecl = (MethodDeclaration)DOMCompletionUtils.findParent(this.toComplete, new int[] { ASTNode.METHOD_DECLARATION });
 					if (parentTypeDeclaration != null && methodDecl != null && (methodDecl.getModifiers() & Flags.AccStatic) == 0) {
 						if (completionContext.getCurrentTypeBinding().isSubTypeCompatible(qualifierTypeBinding)) {
-							if (!isFailedMatch(this.prefix.toCharArray(), Keywords.THIS)) {
+							if (parentTypeDeclarations.stream().anyMatch(parent -> parent.getKey().equals(qualifierTypeBinding.getKey()))
+									&& !isFailedMatch(this.prefix.toCharArray(), Keywords.THIS)) {
 								CompletionProposal res = createKeywordProposal(Keywords.THIS, startPos, endPos);
 								res.setRelevance(res.getRelevance() + RelevanceConstants.R_NON_INHERITED);
 								this.requestor.accept(res);
 							}
-							if (!isFailedMatch(this.prefix.toCharArray(), Keywords.SUPER)) {
-								this.requestor.accept(createKeywordProposal(Keywords.SUPER, startPos, endPos));
+							if ((!completionContext.getCurrentTypeBinding().isInterface() || !completionContext.getCurrentTypeBinding().getKey().equals(qualifierTypeBinding.getKey()))
+									&& !isFailedMatch(this.prefix.toCharArray(), Keywords.SUPER)) {
+								CompletionProposal res = createKeywordProposal(Keywords.SUPER, startPos, endPos);
+								if (!completionContext.getCurrentTypeBinding().getKey().equals(qualifierTypeBinding.getKey())) {
+									res.setRelevance(res.getRelevance() + RelevanceConstants.R_NON_INHERITED);
+								}
+								this.requestor.accept(res);
 							}
 						}
 						if (!isFailedMatch(this.prefix.toCharArray(), Keywords.CLASS)) {

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

@@ -28,6 +28,8 @@
 import org.eclipse.jdt.core.WorkingCopyOwner;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
 import org.eclipse.jdt.core.dom.Expression;
 import org.eclipse.jdt.core.dom.ExpressionMethodReference;
 import org.eclipse.jdt.core.dom.FieldAccess;
@@ -316,4 +318,18 @@ public static TrueFalseCasts collectTrueFalseCasts(Expression e, IVariableBindin
 		}
 	}
 
+	public static List<ITypeBinding> getParentTypeDeclarations(ASTNode cursor) {
+		List<ITypeBinding> parentTypeBinding = new ArrayList<>();
+		while (DOMCompletionUtils.findParentTypeDeclaration(cursor) != null) {
+			ASTNode parentTypeDeclaration = DOMCompletionUtils.findParentTypeDeclaration(cursor);
+			if (parentTypeDeclaration instanceof AbstractTypeDeclaration typeDecl) {
+				parentTypeBinding.add(typeDecl.resolveBinding());
+			} else {
+				parentTypeBinding.add(((AnonymousClassDeclaration)parentTypeDeclaration).resolveBinding());
+			}
+			cursor = parentTypeDeclaration.getParent();
+		}
+		return parentTypeBinding;
+	}
+
 }