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

let the lookup pretend to know about elements' matchers, not elements themselves

Browse Source
This commit is contained in:
peter
2011-04-18 14:52:41 +02:00
parent 2be0d770cb
commit 10646035be
10 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java
+1 -3
View File
@@ -74,9 +74,7 @@ public class JavaCharFilter extends CharFilter {
if (c == ',' && o instanceof PsiVariable) {
int lookupStart = ((LookupImpl)lookup).getLookupStart();
String name = ((PsiVariable)o).getName();
if (lookupStart >= 0 &&
name != null &&
name.equals(item.getPrefixMatcher().getPrefix() + ((LookupImpl)lookup).getAdditionalPrefix())) {
if (lookupStart >= 0 && name != null && name.equals(lookup.itemPattern(item))) {
return Result.HIDE_LOOKUP;
}
}
java/testFramework/src/com/intellij/codeInsight/completion/CompletionTestCase.java
+1 -1
View File
@@ -56,7 +56,7 @@ public abstract class CompletionTestCase extends DaemonAnalyzerTestCase {
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(myEditor);
myItems = lookup == null ? null : lookup.getItems().toArray(new LookupElement[lookup.getItems().size()]);
myPrefix = lookup == null ? "" : lookup.getItems().get(0).getPrefixMatcher().getPrefix();
myPrefix = lookup == null ? "" : lookup.itemPattern(lookup.getItems().get(0));
}
public void setType(CompletionType type) {
java/testFramework/src/com/intellij/codeInsight/completion/LightCompletionTestCase.java
+1 -1
View File
@@ -50,7 +50,7 @@ public abstract class LightCompletionTestCase extends LightCodeInsightTestCase {
LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(myEditor);
myItems = lookup == null ? null : lookup.getItems().toArray(LookupElement.EMPTY_ARRAY);
myPrefix = lookup == null ? null : lookup.getItems().get(0).getPrefixMatcher().getPrefix();
myPrefix = lookup == null ? null : lookup.itemPattern(lookup.getItems().get(0));
}
public void setType(CompletionType type) {