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

prefer lookup items with shorter tail text (e.g. List#add(element) without index)

Browse Source
This commit is contained in:
peter
2017-02-01 09:22:50 +01:00
parent 78a429b4bf
commit 07e1a72077
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/completion/normalSorting/PreferListAddWithoutIndex.java
+5
View File
@@ -0,0 +1,5 @@
public class Usage {
void foo(java.util.List<String> l){
l.ad<caret>
}
}
java/java-tests/testSrc/com/intellij/codeInsight/ParameterInfoTest.java
+4 -4
View File
@@ -226,7 +226,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
"void bar2(int a);" +
"}");
LookupElement[] elements = myFixture.completeBasic();
assertEquals("(int a)", LookupElementPresentation.renderElement(elements[1]).getTailText());
assertEquals("(String a)", LookupElementPresentation.renderElement(elements[1]).getTailText());
myFixture.getLookup().setCurrentItem(elements[1]);
myFixture.type('\n');
@@ -234,7 +234,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
assertEquals("<html>String a</html>", parameterPresentation(1, -1));
assertEquals("<html>int a</html>", parameterPresentation(2, -1));
checkHighlighted(2);
checkHighlighted(1);
}
public void testHighlightConstructorJustChosenInCompletion() {
@@ -249,7 +249,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
"class Bar2 {}");
myFixture.configureByText("a.java", "class Foo {{ new Bar<caret> }}");
LookupElement[] elements = myFixture.completeBasic();
assertEquals("(String a) (default package)", LookupElementPresentation.renderElement(elements[2]).getTailText());
assertEquals("(boolean a) (default package)", LookupElementPresentation.renderElement(elements[2]).getTailText());
myFixture.getLookup().setCurrentItem(elements[2]);
myFixture.type('\n');
myFixture.checkResult("class Foo {{ new Bar(<caret>) }}");
@@ -258,7 +258,7 @@ public class ParameterInfoTest extends LightCodeInsightFixtureTestCase {
assertEquals("<html>String a</html>", parameterPresentation(1, -1));
assertEquals("<html>int a</html>", parameterPresentation(2, -1));
checkHighlighted(1);
checkHighlighted(0);
}
private void checkHighlighted(int lineIndex) {
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+6
View File
@@ -767,4 +767,10 @@ class ContainerUtil extends ContainerUtilRt {
assertPreferredItems 0, 'ContainerUtil', 'ConflictsUtil'
}
void testPreferListAddWithoutIndex() {
checkPreferredItems 0, 'add', 'add', 'addAll', 'addAll'
assert LookupElementPresentation.renderElement(myFixture.lookupElements[1]).tailText.contains('int index')
assert LookupElementPresentation.renderElement(myFixture.lookupElements[3]).tailText.contains('int index')
}
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+2 -2
View File
@@ -144,12 +144,12 @@ class NormalCompletionTest extends LightFixtureCompletionTestCase {
void testMethodItemPresentationGenerics() {
configure()
LookupElementPresentation presentation = renderElement(myItems[0])
LookupElementPresentation presentation = renderElement(myItems[1])
assert "add" == presentation.itemText
assert "(int index, String element)" == presentation.tailText
assert "void" == presentation.typeText
presentation = renderElement(myItems[1])
presentation = renderElement(myItems[0])
assert "(String o)" == presentation.tailText
assert "boolean" == presentation.typeText
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
+2 -1
View File
@@ -161,7 +161,8 @@ public class CompletionLookupArranger extends LookupArranger {
public void addElement(LookupElement element, LookupElementPresentation presentation) {
StatisticsWeigher.clearBaseStatisticsInfo(element);
final String invariant = presentation.getItemText() + "\0###" + getTailTextOrSpace(presentation) + "###" + presentation.getTypeText();
String tail = getTailTextOrSpace(presentation);
String invariant = presentation.getItemText() + "\0###" + String.format("%02d", tail.length()) + tail + "###" + presentation.getTypeText();
element.putUserData(PRESENTATION_INVARIANT, invariant);
element.putUserData(GLOBAL_PRESENTATION_INVARIANT, invariant);