From d2d2e3d860db0361b8128cf9eae6db0cb9561ace Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Mon, 10 Oct 2016 21:33:38 +0300 Subject: [PATCH] Quickfix for https://ea.jetbrains.com/browser/ea_reports/1221217 --- .../src/com/intellij/ide/bookmarks/Bookmark.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java index a65b58ac3274..3a2b9e9b9ec5 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java @@ -53,6 +53,7 @@ import com.intellij.reference.SoftReference; import com.intellij.ui.ColorUtil; import com.intellij.ui.JBColor; import com.intellij.ui.RetrievableIcon; +import com.intellij.util.ObjectUtils; import com.intellij.util.PlatformIcons; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -121,10 +122,10 @@ public class Bookmark implements Navigatable, Comparable { highlighter.setGutterIconRenderer(new MyGutterIconRenderer(this)); TextAttributes textAttributes = - EditorColorsManager.getInstance().getGlobalScheme().getAttributes(CodeInsightColors.BOOKMARKS_ATTRIBUTES); - - Color stripeColor = textAttributes.getErrorStripeColor(); - highlighter.setErrorStripeMarkColor(stripeColor != null ? stripeColor : JBColor.black); + ObjectUtils.notNull(EditorColorsManager.getInstance().getGlobalScheme().getAttributes(CodeInsightColors.BOOKMARKS_ATTRIBUTES), + new TextAttributes()); + Color stripeColor = ObjectUtils.notNull(textAttributes.getErrorStripeColor(), new JBColor(0x000000, 0xdbdbdb)); + highlighter.setErrorStripeMarkColor(stripeColor); highlighter.setErrorStripeTooltip(getBookmarkTooltip()); TextAttributes attributes = highlighter.getTextAttributes();