From 2346670878c2fbea5985705efa616eeed0b9853a Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 30 May 2017 20:56:36 +0200 Subject: [PATCH] let lookup element presentation not depend on completion invocation --- .../codeInsight/completion/CompletionLookupArranger.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java index 1179f1eaff75..28091bda53b4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java @@ -42,8 +42,7 @@ import java.util.*; public class CompletionLookupArranger extends LookupArranger { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.CompletionLookupArranger"); - private static final Key GLOBAL_PRESENTATION_INVARIANT = Key.create("PRESENTATION_INVARIANT"); - private final Key PRESENTATION_INVARIANT = Key.create("PRESENTATION_INVARIANT"); + private static final Key PRESENTATION_INVARIANT = Key.create("PRESENTATION_INVARIANT"); private final Comparator BY_PRESENTATION_COMPARATOR = (o1, o2) -> { PresentationInvariant invariant = PRESENTATION_INVARIANT.get(o1); assert invariant != null; @@ -153,7 +152,6 @@ public class CompletionLookupArranger extends LookupArranger { PresentationInvariant invariant = new PresentationInvariant(presentation.getItemText(), presentation.getTailText(), presentation.getTypeText()); element.putUserData(PRESENTATION_INVARIANT, invariant); - element.putUserData(GLOBAL_PRESENTATION_INVARIANT, invariant); CompletionSorterImpl sorter = obtainSorter(element); Classifier classifier = myClassifiers.get(sorter); @@ -387,7 +385,7 @@ public class CompletionLookupArranger extends LookupArranger { for (int i = 0; i < items.size(); i++) { PresentationInvariant invariant = PRESENTATION_INVARIANT.get(items.get(i)); - if (invariant != null && invariant.equals(GLOBAL_PRESENTATION_INVARIANT.get(lastSelection))) { + if (invariant != null && invariant.equals(PRESENTATION_INVARIANT.get(lastSelection))) { return i; } }