Do not suggest .class .super .this suffix for types

Those are only valid inside expresssions.
mickaelistria · Dec 19, 2024 · 72f8499 · 72f8499
1 parent 3d3f6fc
commit 72f8499
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/DOMCompletionEngine.java
@@ -507,14 +507,16 @@ public void run() {
 						endPos = startPos + qualifiedName.getName().getLength();
 					}
 
-					if (!isFailedMatch(this.prefix.toCharArray(), Keywords.THIS)) {
-						this.requestor.accept(createKeywordProposal(Keywords.THIS, startPos, endPos));
-					}
-					if (!isFailedMatch(this.prefix.toCharArray(), Keywords.SUPER)) {
-						this.requestor.accept(createKeywordProposal(Keywords.SUPER, startPos, endPos));
-					}
-					if (!isFailedMatch(this.prefix.toCharArray(), Keywords.CLASS)) {
-						this.requestor.accept(createClassKeywordProposal(qualifierTypeBinding, startPos, endPos));
+					if (!(this.toComplete instanceof Type)) {
+						if(!isFailedMatch(this.prefix.toCharArray(), Keywords.THIS)) {
+							this.requestor.accept(createKeywordProposal(Keywords.THIS, startPos, endPos));
+						}
+						if (!isFailedMatch(this.prefix.toCharArray(), Keywords.SUPER)) {
+							this.requestor.accept(createKeywordProposal(Keywords.SUPER, startPos, endPos));
+						}
+						if (!isFailedMatch(this.prefix.toCharArray(), Keywords.CLASS)) {
+							this.requestor.accept(createClassKeywordProposal(qualifierTypeBinding, startPos, endPos));
+						}
 					}
 
 					suggestDefaultCompletions = false;
@@ -584,7 +586,7 @@ public void run() {
 								startPos = qualifiedName.getName().getStartPosition();
 								endPos = startPos + qualifiedName.getName().getLength();
 							}
-							if (!isFailedMatch(this.prefix.toCharArray(), Keywords.CLASS)) {
+							if (!(this.toComplete instanceof Type) && !isFailedMatch(this.prefix.toCharArray(), Keywords.CLASS)) {
 								this.requestor.accept(createClassKeywordProposal(qualifierTypeBinding, startPos, endPos));
 							}
 						}