From d2a4ff172d5388d9960a9f492f0355266b1b778e Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 28 Jan 2019 12:00:20 +0300 Subject: [PATCH] New J2K: Add Collection.remove conversion --- .../kotlin/j2k/conversions/BuiltinMembersConversion.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt index 1265b448bc7..b1a0558a643 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/BuiltinMembersConversion.kt @@ -162,6 +162,8 @@ class BuiltinMembersConversion(private val context: ConversionContext) : Recursi Method("java.util.Map.size") convertTo Field("kotlin.collections.Map.size"), Method("java.util.Map.values") convertTo Field("kotlin.collections.Map.values"), Method("java.util.Collection.size") convertTo Field("kotlin.collections.Collection.size"), + Method("java.util.Collection.remove") convertTo Method("kotlin.collections.MutableCollection.remove"), + Method("java.util.List.remove") convertTo Method("kotlin.collections.MutableCollection.removeAt"), Method("java.util.Map.Entry.getKey") convertTo Field("kotlin.collections.Map.Entry.key"), Method("java.util.Map.Entry.getValue") convertTo Field("kotlin.collections.Map.Entry.value"), @@ -176,7 +178,7 @@ class BuiltinMembersConversion(private val context: ConversionContext) : Recursi Method("java.lang.String.valueOf") convertTo ExtensionMethod("kotlin.Any.toString") withReplaceType ReplaceType.FULL_REPLACE - withByArgumentsFilter { it -> it.isNotEmpty() && it.first().type(context.symbolProvider)?.isArrayType() == false }, + withByArgumentsFilter { it.isNotEmpty() && it.first().type(context.symbolProvider)?.isArrayType() == false }, Method("java.util.Collections.singletonList") convertTo Method("kotlin.collections.listOf")