From 0f92d5250ffc8d169161ac4818b824148fcaf2a7 Mon Sep 17 00:00:00 2001 From: Anton Tarasov Date: Thu, 12 Oct 2017 16:47:11 +0300 Subject: [PATCH] IDEA-180505 IAE: Argument for @NotNull parameter 'color' in breadcrumbs --- .../intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java index f45a0cf4a009..c2153518e713 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java @@ -53,6 +53,7 @@ import com.intellij.ui.breadcrumbs.BreadcrumbsUtil; import com.intellij.ui.components.breadcrumbs.Crumb; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.MouseEventAdapter; +import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.MergingUpdateQueue; import com.intellij.util.ui.update.UiNotifyConnector; import com.intellij.util.ui.update.Update; @@ -474,9 +475,9 @@ public class BreadcrumbsXmlWrapper extends JComponent implements Disposable { final TextRange range = psiElement.getTextRange(); final TextAttributes attributes = new TextAttributes(); final CrumbPresentation p = PsiCrumb.getPresentation(crumb); - final Color color = p != null - ? p.getBackgroundColor(false, false, false) - : BreadcrumbsComponent.ButtonSettings.getBackgroundColor(false, false, false, false); + Color color = p == null ? null : p.getBackgroundColor(false, false, false); + if (color == null) color = BreadcrumbsComponent.ButtonSettings.getBackgroundColor(false, false, false, false); + if (color == null) color = UIUtil.getLabelBackground(); final Color background = EditorColorsManager.getInstance().getGlobalScheme().getColor(EditorColors.CARET_ROW_COLOR); attributes.setBackgroundColor(XmlTagTreeHighlightingUtil.makeTransparent(color, background != null ? background : Gray._200, 0.3)); myHighlighed = new ArrayList<>(1);