From 7fb2452dbaddd1dd0414a8fe301e84562d994aa8 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Sat, 9 Jun 2018 16:51:24 +0300
Subject: [PATCH] 182: Fix `toNullability` clash in j2k

---
 .../jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
index f0d74fdb8bc..b44288eca88 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt
@@ -47,12 +47,12 @@ object IdeaSuperMethodSearcher : SuperMethodsSearcher {
 
 private object IdeaJavaDataFlowAnalyzerFacade : JavaDataFlowAnalyzerFacade {
     override fun variableNullability(variable: PsiVariable, context: PsiElement): Nullability =
-            DfaUtil.checkNullness(variable, context).toNullability()
+            DfaUtil.checkNullness(variable, context).toJ2KNullability()
 
     override fun methodNullability(method: PsiMethod): Nullability =
-            DfaUtil.inferMethodNullity(method).toNullability()
+            DfaUtil.inferMethodNullity(method).toJ2KNullability()
 
-    private fun Nullness.toNullability() = when (this) {
+    private fun Nullness.toJ2KNullability() = when (this) {
         Nullness.UNKNOWN -> Nullability.Default
         Nullness.NOT_NULL -> Nullability.NotNull
         Nullness.NULLABLE -> Nullability.Nullable