MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup [java-completion]: make addWildcardExtendsSuper part of regular keyword completion procedure

Browse Source 
GitOrigin-RevId: 04d87f8da62a82e890159470ad3f8d8e5624c0db
This commit is contained in:
Tagir Valeev
2025-11-17 11:23:12 +00:00
committed by intellij-monorepo-bot
parent 21de9c8b91
commit 81a8fedbfa
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+5 -4
View File
@@ -453,15 +453,16 @@ public final class JavaCompletionContributor extends CompletionContributor imple
PrefixMatcher matcher = result.getPrefixMatcher();
PsiElement parent = position.getParent();
if (new JavaKeywordCompletion(parameters, session, smart).addWildcardExtendsSuper(result, position)) {
result.stopHere();
return;
}
boolean mayCompleteReference = true;
if (position instanceof PsiIdentifier) {
addIdentifierVariants(parameters, position, result, session, matcher);
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(position)) {
session.flushBatchItems();
result.stopHere();
return;
}
Set<ExpectedTypeInfo> expectedInfos = ContainerUtil.newHashSet(JavaSmartCompletionContributor.getExpectedTypes(parameters));
boolean shouldAddExpressionVariants = shouldAddExpressionVariants(parameters);
java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+7 -6
View File
@@ -265,6 +265,9 @@ public class JavaKeywordCompletion {
return;
}
if (addWildcardExtendsSuper()) {
return;
}
addFinal();
addWhen();
boolean statementPosition = isStatementPosition(myPosition);
@@ -496,13 +499,11 @@ public class JavaKeywordCompletion {
return false;
}
boolean addWildcardExtendsSuper(CompletionResultSet result, PsiElement position) {
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(position)) {
private boolean addWildcardExtendsSuper() {
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(myPosition)) {
for (String keyword : ContainerUtil.ar(JavaKeywords.EXTENDS, JavaKeywords.SUPER)) {
if (myKeywordMatcher.isStartMatch(keyword)) {
LookupElement item = BasicExpressionCompletionContributor.createKeywordLookupItem(position, keyword);
result.addElement(new OverridableSpace(item, TailTypes.humbleSpaceBeforeWordType()));
}
LookupElement item = BasicExpressionCompletionContributor.createKeywordLookupItem(myPosition, keyword);
addKeyword(new OverridableSpace(item, TailTypes.humbleSpaceBeforeWordType()));
}
return true;
}