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

separate "? extends/super" completion

Browse Source
This commit is contained in:
peter
2017-04-05 15:46:52 +02:00
parent d0fe2228c7
commit d60f2e865e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+4 -4
View File
@@ -231,12 +231,12 @@ public class JavaCompletionContributor extends CompletionContributor {
return;
}
if (position instanceof PsiIdentifier) {
addIdentifierVariants(parameters, position, result, session, matcher);
if (JavaKeywordCompletion.addWildcardExtendsSuper(result, position)) {
return;
}
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(position)) {
return;
if (position instanceof PsiIdentifier) {
addIdentifierVariants(parameters, position, result, session, matcher);
}
Set<String> usedWords = addReferenceVariants(parameters, result, session);
java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java
+7 -8
View File
@@ -286,10 +286,6 @@ public class JavaKeywordCompletion {
return;
}
if (addWildcardExtendsSuper()) {
return;
}
addFinal();
boolean statementPosition = isStatementPosition(myPosition);
@@ -324,10 +320,13 @@ public class JavaKeywordCompletion {
addExtendsImplements();
}
private boolean addWildcardExtendsSuper() {
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(myPosition)) {
addKeyword(new OverrideableSpace(createKeyword(PsiKeyword.EXTENDS), TailType.HUMBLE_SPACE_BEFORE_WORD));
addKeyword(new OverrideableSpace(createKeyword(PsiKeyword.SUPER), TailType.HUMBLE_SPACE_BEFORE_WORD));
static boolean addWildcardExtendsSuper(CompletionResultSet result, PsiElement position) {
if (JavaMemberNameCompletionContributor.INSIDE_TYPE_PARAMS_PATTERN.accepts(position)) {
for (String keyword : ContainerUtil.ar(PsiKeyword.EXTENDS, PsiKeyword.SUPER)) {
if (keyword.startsWith(result.getPrefixMatcher().getPrefix())) {
result.addElement(new OverrideableSpace(BasicExpressionCompletionContributor.createKeywordLookupItem(position, keyword), TailType.HUMBLE_SPACE_BEFORE_WORD));
}
}
return true;
}
return false;