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

there's no need anymore to artificially move live template items to the second place in the autopopup

Browse Source
This commit is contained in:
peter
2013-11-02 20:41:17 +01:00
parent f92ce9af06
commit f7ae406fef
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+7 -7
View File
@@ -116,7 +116,7 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
}
""")
type "r"
assertContains "iterable", "iter"
myFixture.assertPreferredCompletionItems 1, "iter", "iterable"
type '\b'
assertContains "iterable"
@@ -131,7 +131,7 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
assertContains "iterable"
type "r"
assertContains "iterable", "iter"
myFixture.assertPreferredCompletionItems 1, "iter", "iterable"
}
public void testExplicitSelectionShouldSurvive() {
@@ -151,7 +151,7 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
assertEquals 'iterable2', lookup.currentItem.lookupString
type "r"
myFixture.assertPreferredCompletionItems 2, "iterable", "iter", 'iterable2'
myFixture.assertPreferredCompletionItems 2, "iter", "iterable", 'iterable2'
}
@@ -172,7 +172,7 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
assertEquals 'iterable2', lookup.currentItem.lookupString
type "r"
myFixture.assertPreferredCompletionItems 2, "iterable", "iter", 'iterable2'
myFixture.assertPreferredCompletionItems 2, "iter", "iterable", 'iterable2'
}
@@ -1305,7 +1305,7 @@ class Foo {
type 'e'
myFixture.assertPreferredCompletionItems 0, 'itera', 'itex'
type 'r'
myFixture.assertPreferredCompletionItems 0, 'itera', 'iter'
myFixture.assertPreferredCompletionItems 1, 'iter', 'itera'
type '\b'
myFixture.assertPreferredCompletionItems 0, 'itera', 'itex'
}
@@ -1544,9 +1544,9 @@ class Foo {
}
'''
type 'tpl'
myFixture.assertPreferredCompletionItems 0, 'tplMn', 'tpl'
myFixture.assertPreferredCompletionItems 1, 'tpl', 'tplMn'
LookupElementPresentation p = LookupElementPresentation.renderElement(myFixture.lookupElements[1])
LookupElementPresentation p = LookupElementPresentation.renderElement(myFixture.lookupElements[0])
assert p.itemText == 'tpl'
assert !p.tailText
def tabKeyPresentation = KeyEvent.getKeyText(TemplateSettings.TAB_CHAR as int)
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
+1 -9
View File
@@ -223,15 +223,7 @@ public class CompletionLookupArranger extends LookupArranger {
ensureItemAdded(items, model, byRelevance, relevantSelection);
ensureEverythingVisibleAdded(lookup, model, byRelevance);
ArrayList<LookupElement> result = new ArrayList<LookupElement>(model);
if (result.size() > 1) {
LookupElement first = result.get(0);
if (isLiveTemplate(first) && isPrefixItem(lookup, first, true) && CompletionServiceImpl.isStartMatch(result.get(1), lookup)) {
ContainerUtil.swapElements(result, 0, 1);
}
}
return result;
return new ArrayList<LookupElement>(model);
}
private static void ensureEverythingVisibleAdded(LookupImpl lookup, final LinkedHashSet<LookupElement> model, Iterator<LookupElement> byRelevance) {