MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] ReplaceJavaStaticMethodWithKotlinAnalogInspection: allow some nullable arguments

Browse Source 
Kotlin stdlib 1.4+ now supports such code.

^KTIJ-25310 Fixed

GitOrigin-RevId: 8caf0e783e4566abeba66b1f837bd9a37624afee
This commit is contained in:
Alexey Belkov
2023-04-20 12:20:02 +00:00
committed by intellij-monorepo-bot
parent fd6512651c
commit 22c1138be5
8 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt
+6 -6
View File
@@ -158,22 +158,22 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
it.valueArguments.size == 2
},
Replacement("java.util.Arrays.copyOfRange", "kotlin.collections.copyOfRange", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.util.Arrays.equals", "kotlin.collections.contentEquals", ToExtensionFunctionWithNonNullableArguments) {
Replacement("java.util.Arrays.equals", "kotlin.collections.contentEquals", ToExtensionFunctionWithNullableReceiver) {
it.valueArguments.size == 2
},
Replacement("java.util.Arrays.deepEquals", "kotlin.collections.contentDeepEquals", ToExtensionFunctionWithNonNullableArguments),
Replacement("java.util.Arrays.deepEquals", "kotlin.collections.contentDeepEquals", ToExtensionFunctionWithNullableReceiver),
Replacement(
"java.util.Arrays.deepHashCode",
"kotlin.collections.contentDeepHashCode",
ToExtensionFunctionWithNonNullableReceiver
ToExtensionFunctionWithNullableReceiver
),
Replacement("java.util.Arrays.hashCode", "kotlin.collections.contentHashCode", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.util.Arrays.hashCode", "kotlin.collections.contentHashCode", ToExtensionFunctionWithNullableReceiver),
Replacement(
"java.util.Arrays.deepToString",
"kotlin.collections.contentDeepToString",
ToExtensionFunctionWithNonNullableReceiver
ToExtensionFunctionWithNullableReceiver
),
Replacement("java.util.Arrays.toString", "kotlin.collections.contentToString", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.util.Arrays.toString", "kotlin.collections.contentToString", ToExtensionFunctionWithNullableReceiver),
Replacement("java.util.Arrays.asList", "kotlin.collections.listOf"),
Replacement("java.util.Arrays.asList", "kotlin.collections.mutableListOf"),
Replacement("java.util.Set.of", "kotlin.collections.setOf"),
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/Transformation.kt
-13
View File
@@ -68,19 +68,6 @@ object ToExtensionFunctionWithNonNullableReceiver : Transformation {
?.isNullable() == false
}
object ToExtensionFunctionWithNonNullableArguments : Transformation {
override fun invoke(callExpression: KtCallExpression, replacement: Replacement) =
ToExtensionFunctionWithNonNullableReceiver(callExpression, replacement)
override fun isApplicable(callExpression: KtCallExpression): Boolean =
ToExtensionFunctionWithNonNullableReceiver.isApplicable(callExpression)
override fun isApplicableInContext(callExpression: KtCallExpression, context: BindingContext): Boolean =
callExpression.valueArguments.all {
it.getArgumentExpression()?.getType(context)?.isNullable() == false
}
}
object ToExtensionFunctionWithNullableReceiver : Transformation {
override fun invoke(callExpression: KtCallExpression, replacement: Replacement) =
ToExtensionFunctionWithNonNullableReceiver(callExpression, replacement)
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/deepEqualsWithNullOther.kt
-1
View File
@@ -1,5 +1,4 @@
// WITH_STDLIB
// PROBLEM: none
import java.util.Arrays
fun test() {
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/deepEqualsWithNullOther.kt.after
+8
View File
@@ -0,0 +1,8 @@
// WITH_STDLIB
import java.util.Arrays
fun test() {
val a = arrayOf(1, 2, 3)
val b: Array<*>? = null
val result = a.contentDeepEquals(b)
}
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/equalsWithNullOther.kt
-1
View File
@@ -1,5 +1,4 @@
// WITH_STDLIB
// PROBLEM: none
import java.util.Arrays
fun test() {
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/equalsWithNullOther.kt.after
+8
View File
@@ -0,0 +1,8 @@
// WITH_STDLIB
import java.util.Arrays
fun test() {
val a = arrayOf(1, 2, 3)
val b: Array<*>? = null
val result = a.contentEquals(b)
}
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/toStringWithNullableReceiver.kt
-1
View File
@@ -1,5 +1,4 @@
// WITH_STDLIB
// PROBLEM: none
import java.util.Arrays
fun test() {
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/toStringWithNullableReceiver.kt.after
+7
View File
@@ -0,0 +1,7 @@
// WITH_STDLIB
import java.util.Arrays
fun test() {
val a: Array<*>? = arrayOf(1)
val str = a.contentToString()
}