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

ensure keywords are added before overridden method variants (IDEA-102228)

Browse Source
This commit is contained in:
peter
2013-03-01 17:13:09 +01:00
parent 1744117d84
commit 5bfb703b14
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+2
View File
@@ -235,6 +235,8 @@ public class JavaCompletionContributor extends CompletionContributor {
}
}
JavaOverrideCompletionContributor.fillCompletionVariants(parameters, result);
addAllClasses(parameters, result, inheritors);
final PsiElement parent = position.getParent();
java/java-impl/src/com/intellij/codeInsight/completion/JavaOverrideCompletionContributor.java
+2 -4
View File
@@ -38,11 +38,10 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
/**
* @author peter
*/
public class JavaOverrideCompletionContributor extends CompletionContributor {
public class JavaOverrideCompletionContributor {
static final Key<Boolean> OVERRIDE_ELEMENT = Key.create("OVERRIDE_ELEMENT");
@Override
public void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet _result) {
public static void fillCompletionVariants(CompletionParameters parameters, CompletionResultSet result) {
if (parameters.getCompletionType() != CompletionType.BASIC && parameters.getCompletionType() != CompletionType.SMART) {
return;
}
@@ -53,7 +52,6 @@ public class JavaOverrideCompletionContributor extends CompletionContributor {
andNot(psiElement().afterLeaf(psiElement().inside(PsiModifierList.class))).accepts(position)) {
final PsiClass parent = CompletionUtil.getOriginalElement((PsiClass)position.getParent().getParent().getParent());
if (parent != null) {
CompletionResultSet result = JavaCompletionSorting.addJavaSorting(parameters, _result);
addSuperSignatureElements(parent, true, result);
addSuperSignatureElements(parent, false, result);
}
resources/src/META-INF/IdeaPlugin.xml
-2
View File
@@ -301,8 +301,6 @@
order="before javaLegacy, before default"/>
<completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor" id="javaMemberName"
order="before javaOverride"/>
<completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaOverrideCompletionContributor" id="javaOverride"
order="before javaLegacy"/>
<completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor" id="javaClassName"
order="last, before default"/>