From 3b51b5a51b9d18ca736bd7ec9b64941b88b9f7a6 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 3 Dec 2014 18:58:45 +0300 Subject: [PATCH] Replaced hard-coded gray color --- .../jetbrains/jet/plugin/completion/LookupElementFactory.kt | 4 ++-- .../org/jetbrains/jet/completion/ExpectedCompletionUtils.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index c26e73afd41..42ee00800cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -35,9 +35,9 @@ import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import java.awt.Color import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer import org.jetbrains.jet.lang.types.TypeUtils +import com.intellij.codeInsight.lookup.impl.LookupCellRenderer public class LookupElementFactory( private val receiverTypes: Collection @@ -78,7 +78,7 @@ public class LookupElementFactory( presentation.setItemTextBold(true) } else { - presentation.setItemTextForeground(Color.GRAY) + presentation.setItemTextForeground(LookupCellRenderer.getGrayedForeground(false)) // gray all tail fragments too: val fragments = presentation.getTailFragments() presentation.clearTail() diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java index 7c60fe78136..831bb9d45ca 100644 --- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java @@ -25,6 +25,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementPresentation; +import com.intellij.codeInsight.lookup.impl.LookupCellRenderer; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.JBColor; import com.intellij.util.ArrayUtil; @@ -326,7 +327,7 @@ public class ExpectedCompletionUtils { } Color foreground = presentation.getItemTextForeground(); if (!foreground.equals(JBColor.foreground())) { - assert foreground.equals(Color.GRAY); + assert foreground.equals(LookupCellRenderer.getGrayedForeground(false)); if (builder.length() > 0) builder.append(" "); builder.append("grayed"); }