From c673dfe240ffa2613ef59ec329a2166f88d5896e Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 27 Apr 2015 13:33:05 +0300
Subject: [PATCH] IDEA-139645 diff: it's OK to have nullable color for 'error
 stripe markers'

---
 platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java | 2 +-
 .../src/com/intellij/diff/util/TextDiffTypeFactory.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java b/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java
index 5029ccbc79d5..8b329e70cc32 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java
@@ -42,6 +42,6 @@ public interface TextDiffType {
   @NotNull
   Color getIgnoredColor(@Nullable Editor editor);
 
-  @NotNull
+  @Nullable
   Color getMarkerColor(@Nullable Editor editor);
 }
diff --git a/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java
index fae32ac015fc..b1f456c9a65a 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java
@@ -102,7 +102,7 @@ public class TextDiffTypeFactory {
       }
     }
 
-    @NotNull
+    @Nullable
     @Override
     public Color getMarkerColor(@Nullable Editor editor) {
       return getAttributes(editor).getErrorStripeColor();