azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New J2K: Fix indicesByCollectionSize in for conversion

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-17 18:21:22 +03:00
committed by Ilya Kirillov
parent 6c696f6c60
commit e43eb4da03
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
+2 -7
View File
@@ -239,14 +239,9 @@ class ForConversion(private val context: ConversionContext) : RecursiveApplicabl
private fun indicesByCollectionSize(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? { private fun indicesByCollectionSize(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? {
val methodCall = javaSizeCall.selector as? JKMethodCallExpression ?: return null val methodCall = javaSizeCall.selector as? JKMethodCallExpression ?: return null
val receiverType = javaSizeCall.receiver.type(context.symbolProvider) ?: return null return if (methodCall.identifier.deepestFqName() == "java.util.Collection.size"
if (methodCall.identifier.name == "size"
&& methodCall.arguments.expressions.isEmpty() && methodCall.arguments.expressions.isEmpty()
&& receiverType.isCollectionType(context.symbolProvider) ) toIndicesCall(javaSizeCall) else null
) {
return toIndicesCall(javaSizeCall)
}
return null
} }
private fun indicesByArrayLength(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? { private fun indicesByArrayLength(javaSizeCall: JKQualifiedExpression): JKQualifiedExpression? {