From b676817ad3c802f2eaec468f1a04cb268d032839 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 17 Aug 2018 15:12:51 +0300
Subject: [PATCH] correct contract

---
 platform/util/src/com/intellij/util/ObjectUtils.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/util/src/com/intellij/util/ObjectUtils.java b/platform/util/src/com/intellij/util/ObjectUtils.java
index bd3cf2f74fbb..29f8c389a28d 100644
--- a/platform/util/src/com/intellij/util/ObjectUtils.java
+++ b/platform/util/src/com/intellij/util/ObjectUtils.java
@@ -58,17 +58,17 @@ public class ObjectUtils {
     }
   }
 
-  @Contract(value = "!null, _ -> !null; _, !null -> !null; _, _ -> null", pure = true)
+  @Contract(value = "!null, _ -> !null; _, !null -> !null; null, null -> null", pure = true)
   public static <T> T chooseNotNull(@Nullable T t1, @Nullable T t2) {
     return t1 == null? t2 : t1;
   }
 
-  @Contract(value = "!null, _ -> !null; _, !null -> !null; _, _ -> null", pure = true)
+  @Contract(value = "!null, _ -> !null; _, !null -> !null; null, null -> null", pure = true)
   public static <T> T coalesce(@Nullable T t1, @Nullable T t2) {
     return chooseNotNull(t1, t2);
   }
 
-  @Contract(value = "!null, _, _ -> !null; _, !null, _ -> !null; _, _, !null -> !null; _,_,_ -> null", pure = true)
+  @Contract(value = "!null, _, _ -> !null; _, !null, _ -> !null; _, _, !null -> !null; null,null,null -> null", pure = true)
   public static <T> T coalesce(@Nullable T t1, @Nullable T t2, @Nullable T t3) {
     return t1 != null ? t1 : t2 != null ? t2 : t3;
   }
@@ -130,7 +130,7 @@ public class ObjectUtils {
 
   @Nullable
   @Contract("null, _ -> null")
-  public static <T> T nullizeByCondition(@Nullable final T obj, @NotNull final Condition<T> condition) {
+  public static <T> T nullizeByCondition(@Nullable final T obj, @NotNull final Condition<? super T> condition) {
     if (condition.value(obj)) {
       return null;
     }