From e43eb4da03946d7b483205a69304e89b2d363eba Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 17 Jan 2019 18:21:22 +0300
Subject: [PATCH] New J2K: Fix indicesByCollectionSize in for conversion

---
 .../jetbrains/kotlin/j2k/conversions/ForConversion.kt    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
index 64ffabcf7a9..1cb0254415f 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
@@ -239,14 +239,9 @@ class ForConversion(private val context: ConversionContext) : RecursiveApplicabl
 
     private fun indicesByCollectionSize(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? {
         val methodCall = javaSizeCall.selector as? JKMethodCallExpression ?: return null
-        val receiverType = javaSizeCall.receiver.type(context.symbolProvider) ?: return null
-        if (methodCall.identifier.name == "size"
+        return if (methodCall.identifier.deepestFqName() == "java.util.Collection.size"
             && methodCall.arguments.expressions.isEmpty()
-            && receiverType.isCollectionType(context.symbolProvider)
-        ) {
-            return toIndicesCall(javaSizeCall)
-        }
-        return null
+        ) toIndicesCall(javaSizeCall) else null
     }
 
     private fun indicesByArrayLength(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? {