From 69ceb301969eb167bc21703a18bd3d478ada7d29 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Sat, 2 Sep 2017 18:49:39 +0300
Subject: [PATCH] rename mapNotNull() to filterMap() for kotlin compatibility

---
 .../src/com/intellij/util/containers/JBIterable.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/JBIterable.java b/platform/util/src/com/intellij/util/containers/JBIterable.java
index 44edf8ae1692..40f5a6226aca 100644
--- a/platform/util/src/com/intellij/util/containers/JBIterable.java
+++ b/platform/util/src/com/intellij/util/containers/JBIterable.java
@@ -519,13 +519,14 @@ public abstract class JBIterable<E> implements Iterable<E> {
   }
 
   /**
-   * Synonym for map(..).filter(o -> o != null).
+   * Synonym for map(..).filter(notNull()).
    *
-   * @see JBIterable#transform(Function)
+   * @see JBIterable#map(Function)
+   * @see JBIterable#filter(Condition)
    */
   @NotNull
-  public final <T> JBIterable<T> mapNotNull(@NotNull Function<? super E, T> function) {
-    return transform(function).filter(Conditions.<T>notNull());
+  public final <T> JBIterable<T> filterMap(@NotNull Function<? super E, T> function) {
+    return map(function).filter(Conditions.<T>notNull());
   }
 
   /**