From ec1b069afc6c9961aa018ee6a572ef14feafd344 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 26 Mar 2015 20:13:59 +0300 Subject: [PATCH] IDEA-138322 diff: fix NPE it's OK to have null here, but other places will continue to fail --- .../com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java index e21caefa1ddc..5309d83c332f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerDrawing.java @@ -349,7 +349,7 @@ public class LineStatusTrackerDrawing { } } - @NotNull + @Nullable private static Color getDiffColor(@NotNull Range range) { final EditorColorsScheme globalScheme = EditorColorsManager.getInstance().getGlobalScheme(); switch (range.getType()) {