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

farewell green items in completion

Browse Source
This commit is contained in:
peter
2012-02-01 22:20:58 +01:00
parent b46549c0e0
commit 5f8d9f702f
6 changed files with 21 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class CompletionLookupArranger extends LookupArranger {
CompletionLocation myLocation = new CompletionLocation(indicator.getParameters());
final StatisticsInfo main = StatisticsManager.serialize(CompletionService.STATISTICS_KEY, item, myLocation);
final List<LookupElement> items = lookupImpl.getItems();
final int count = Math.min(lookupImpl.getPreferredItemsCount(), lookupImpl.getList().getSelectedIndex());
final int count = Math.min(3, lookupImpl.getList().getSelectedIndex());
final List<StatisticsInfo> ignored = new ArrayList<StatisticsInfo>();
for (int i = 0; i < count; i++) {
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
-6
View File
@@ -149,12 +149,6 @@ public class LookupCellRenderer implements ListCellRenderer {
}
private Color getItemBackground(JList list, int index, boolean isSelected) {
final int preferredCount = myLookup.getPreferredItemsCount();
final boolean isPreferred = index <= preferredCount - 1 && preferredCount < list.getModel().getSize() - 1 && LookupImpl.limitRelevance();
if (isPreferred) {
return isSelected ? SELECTED_BACKGROUND_COLOR : PREFERRED_BACKGROUND_COLOR;
}
return isSelected ? SELECTED_BACKGROUND_COLOR : BACKGROUND_COLOR;
}
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
-23
View File
@@ -48,7 +48,6 @@ import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Trinity;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
@@ -100,7 +99,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
private final Project myProject;
private final Editor myEditor;
private int myPreferredItemsCount;
private String myInitialPrefix;
private boolean myStableStart;
@@ -258,10 +256,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
}
public int getPreferredItemsCount() {
return myPreferredItemsCount;
}
public void markSelectionTouched() {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
ApplicationManager.getApplication().assertIsDispatchThread();
@@ -428,7 +422,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
}
myPreferredItemsCount = model.size();
myFrozenItems.clear();
if (myShown) {
myFrozenItems.addAll(model);
@@ -443,8 +436,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
});
model.addAll(elements);
} else if (limitRelevance()) {
model.addAll(addRemainingItemsLexicographically(model, items));
} else {
for (List<LookupElement> group : snapshot.second) {
for (LookupElement element : group) {
@@ -579,16 +570,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
return p;
}
private static List<LookupElement> addRemainingItemsLexicographically(Set<LookupElement> firstItems, Collection<LookupElement> allItems) {
List<LookupElement> model = new ArrayList<LookupElement>();
for (LookupElement item : allItems) {
if (!firstItems.contains(item)) {
model.add(item);
}
}
return model;
}
private void addMostRelevantItems(final Set<LookupElement> model, final Iterable<List<LookupElement>> sortedItems) {
if (model.size() > MAX_PREFERRED_COUNT) return;
@@ -605,10 +586,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
}
}
public static boolean limitRelevance() {
return Registry.is("limited.relevance.sorting.in.completion");
}
public boolean isFrozen(@NotNull LookupElement element) {
return myFrozenItems.contains(element);
}
platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java
+15 -17
View File
@@ -26,7 +26,9 @@ import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.util.text.StringUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -50,23 +52,19 @@ public class DumpLookupElementWeights extends AnAction implements DumbAware {
}
public static void dumpLookupElementWeights(final LookupImpl lookup) {
final LinkedHashMap<LookupElement,StringBuilder> strings = lookup.getRelevanceStrings();
final List<LookupElement> items = lookup.getItems();
final int count = lookup.getPreferredItemsCount();
for (int i = 0; i < items.size(); i++) {
LookupElement item = items.get(i);
String weight = strings.get(item).toString();
final String s = item.getLookupString() + (lookup.isFrozen(item) ? "\t_first_\t" : "\t") + weight;
System.out.println(s);
LOG.info(s);
if (i == count - 1) {
final String separator = "------------";
System.out.println(separator);
LOG.info(separator);
}
}
String sb = StringUtil.join(getLookupElementWeights(lookup), "\n");
System.out.println(sb);
LOG.info(sb);
}
public static List<String> getLookupElementWeights(LookupImpl lookup) {
final LinkedHashMap<LookupElement,StringBuilder> strings = lookup.getRelevanceStrings();
List<String> sb = new ArrayList<String>();
for (LookupElement item : lookup.getItems()) {
String weight = strings.get(item).toString();
final String s = item.getLookupString() + (lookup.isFrozen(item) ? "\t_first_\t" : "\t") + weight;
sb.add(s);
}
return sb;
}
}
platform/platform-resources-en/src/misc/registry.properties
-2
View File
@@ -171,8 +171,6 @@ documentation.component.editor.font=false
ide.mac.useNativeClipboard=false
show.all.classes.on.first.completion=false
limited.relevance.sorting.in.completion=false
limited.relevance.sorting.in.completion.description=Whether only 5 most relevant items are shown at the top of the completion list, or it's sorted by relevance completely
ide.enable.toolwindow.stack=false
change.signature.awesome.mode=true
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+5 -17
View File
@@ -49,6 +49,7 @@ import com.intellij.ide.startup.StartupManagerEx;
import com.intellij.ide.startup.impl.StartupManagerImpl;
import com.intellij.ide.structureView.StructureViewBuilder;
import com.intellij.ide.structureView.newStructureView.StructureViewComponent;
import com.intellij.internal.DumpLookupElementWeights;
import com.intellij.lang.LanguageStructureViewBuilder;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
@@ -1747,25 +1748,12 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
final LookupImpl lookup = getLookup();
assertNotNull(lookup);
final LinkedHashMap<LookupElement,StringBuilder> relevanceStrings = lookup.getRelevanceStrings();
final JList list = lookup.getList();
final List<LookupElement> model = lookup.getItems();
final List<String> actual = new ArrayList<String>();
final int count = lookup.getPreferredItemsCount();
for (int i = 0; i < count; i++) {
actual.add(model.get(i).getLookupString());
}
List<String> strings = getLookupElementStrings();
assert strings != null;
final List<String> actual = strings.subList(0, Math.min(expected.length, strings.size()));
if (!actual.equals(Arrays.asList(expected))) {
final List<String> strings = new ArrayList<String>();
for (int i = 0; i < model.size(); i++) {
final LookupElement item = model.get(i);
strings.add(item.getLookupString() + " " + relevanceStrings.get(item));
if (i == count - 1) {
strings.add("---");
}
}
assertOrderedEquals(strings, expected);
assertOrderedEquals(DumpLookupElementWeights.getLookupElementWeights(lookup), expected);
}
assertEquals(selected, list.getSelectedIndex());
}