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

the completion consumers are to handle CompletionResult instead of LookupElement now

Browse Source
This commit is contained in:
peter
2011-04-18 16:11:26 +02:00
parent 98195ed940
commit 7ee3179f32
12 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/AbstractBasicToClassNameDelegator.java
+7 -7
View File
@@ -39,10 +39,10 @@ public abstract class AbstractBasicToClassNameDelegator extends CompletionContri
if (!isClassNameCompletionSupported(result, file, position)) return;
final Ref<Boolean> empty = Ref.create(true);
result.runRemainingContributors(parameters, new Consumer<LookupElement>() {
public void consume(final LookupElement lookupElement) {
result.runRemainingContributors(parameters, new Consumer<CompletionResult>() {
public void consume(final CompletionResult lookupElement) {
empty.set(false);
result.addElement(lookupElement);
result.passResult(lookupElement);
}
});
@@ -59,10 +59,10 @@ public abstract class AbstractBasicToClassNameDelegator extends CompletionContri
}
CompletionService.getCompletionService().getVariantsFromContributors(classParams, null, new Consumer<LookupElement>() {
public void consume(final LookupElement lookupElement) {
updateProperties(lookupElement);
result.addElement(lookupElement);
CompletionService.getCompletionService().getVariantsFromContributors(classParams, null, new Consumer<CompletionResult>() {
public void consume(final CompletionResult lookupElement) {
updateProperties(lookupElement.getLookupElement());
result.passResult(lookupElement);
}
});
}
java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java
+3 -4
View File
@@ -16,7 +16,6 @@
package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.ExpectedTypeInfo;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupItem;
import com.intellij.openapi.util.Ref;
import static com.intellij.patterns.PsiJavaPatterns.psiElement;
@@ -40,10 +39,10 @@ public class NullSmartCompletionContributor extends CompletionContributor{
protected void addCompletions(final CompletionParameters parameters,
final CompletionResultSet result, final Collection<ExpectedTypeInfo> infos) {
final Ref<Boolean> empty = Ref.create(true);
result.runRemainingContributors(parameters, new Consumer<LookupElement>() {
public void consume(final LookupElement lookupElement) {
result.runRemainingContributors(parameters, new Consumer<CompletionResult>() {
public void consume(final CompletionResult lookupElement) {
empty.set(false);
result.addElement(lookupElement);
result.passResult(lookupElement);
}
});