From 026949a75834d1071e92576e49c7f6d552ca664c Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 9 Jul 2019 13:12:42 +0300 Subject: [PATCH] ReplaceJavaStaticMethodWithKotlinAnalogInspection: remove non-implemented cases --- ...aStaticMethodWithKotlinAnalogInspection.kt | 21 ++++++++++--------- .../collections/binarySearch.kt | 7 ------- .../collections/binarySearch.kt.after | 7 ------- .../collections/binarySearch2.kt | 9 -------- .../collections/binarySearch2.kt.after | 10 --------- .../system/arraycopy.kt | 9 -------- .../system/arraycopy.kt.after | 9 -------- .../LocalInspectionTestGenerated.java | 15 ------------- 8 files changed, 11 insertions(+), 76 deletions(-) delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt.after delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt.after delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt delete mode 100644 idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt index ef2eb01f1e1..7e36cb36f72 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt @@ -81,9 +81,10 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti Replacement("java.io.PrintStream.println", "kotlin.io.println", filter = ::isJavaSystemOut) ) + // TODO: implement Transformation for mapping private val JAVA_SYSTEM = listOf( - Replacement("java.lang.System.exit", "kotlin.system.exitProcess"), - Replacement("java.lang.System.arraycopy", "kotlin.collections.copyInto", ToExtensionFunction) // TODO: mapping + Replacement("java.lang.System.exit", "kotlin.system.exitProcess") +// Replacement("java.lang.System.arraycopy", "kotlin.collections.copyInto", ToExtensionFunction) ) private val JAVA_MATH = listOf( @@ -128,16 +129,16 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti it.valueArguments.size == 2 }, Replacement("java.util.Arrays.copyOfRange", "kotlin.collections.copyOfRange", ToExtensionFunction), - Replacement("java.util.Arrays.binarySearch", "kotlin.collections.binarySearch", ToExtensionFunction), // TODO: mapping +// Replacement("java.util.Arrays.binarySearch", "kotlin.collections.binarySearch", ToExtensionFunction), Replacement("java.util.Arrays.equals", "kotlin.collections.contentEquals", ToExtensionFunction), Replacement("java.util.Arrays.deepEquals", "kotlin.collections.contentDeepEquals", ToExtensionFunction), - Replacement("java.util.Arrays.fill", "kotlin.collections.fill", ToExtensionFunction), // TODO: mapping - Replacement("java.util.Arrays.sort", "kotlin.collections.sort", ToExtensionFunction) { - it.valueArguments.size == 3 - }, //TODO: mapping? - Replacement("java.util.Arrays.sort", "kotlin.collections.sortWith", ToExtensionFunction) { - it.valueArguments.size != 3 - }, +// Replacement("java.util.Arrays.fill", "kotlin.collections.fill", ToExtensionFunction), +// Replacement("java.util.Arrays.sort", "kotlin.collections.sort", ToExtensionFunction) { +// it.valueArguments.size == 3 +// }, +// Replacement("java.util.Arrays.sort", "kotlin.collections.sortWith", ToExtensionFunction) { +// it.valueArguments.size != 3 +// }, Replacement("java.util.Arrays.deepHashCode", "kotlin.collections.contentDeepHashCode", ToExtensionFunction), Replacement("java.util.Arrays.hashCode", "kotlin.collections.contentHashCode", ToExtensionFunction), Replacement("java.util.Arrays.deepToString", "kotlin.collections.contentDeepToString", ToExtensionFunction), diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt deleted file mode 100644 index ef60cfd039a..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt +++ /dev/null @@ -1,7 +0,0 @@ -// WITH_RUNTIME -import java.util.Arrays - -fun test() { - val array = arrayOf(1, 2, 3) - val result = Arrays.binarySearch(array, 3) -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt.after b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt.after deleted file mode 100644 index 37c8e1e00fd..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt.after +++ /dev/null @@ -1,7 +0,0 @@ -// WITH_RUNTIME -import java.util.Arrays - -fun test() { - val array = arrayOf(1, 2, 3) - val result = array.binarySearch(3) -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt deleted file mode 100644 index 84d6e7869af..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt +++ /dev/null @@ -1,9 +0,0 @@ -// WITH_RUNTIME -import java.util.Arrays - -fun test() { - val array = arrayOf(1, 2, 3) - val from = 1 - val to = 4 - val result = Arrays.binarySearch(array, from, to, 3) -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt.after b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt.after deleted file mode 100644 index 5e0b380b26e..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt.after +++ /dev/null @@ -1,10 +0,0 @@ -// WITH_RUNTIME -import java.util.Arrays - -fun test() { - val array = arrayOf(1, 2, 3) - val key = 3 - val from = 1 - val to = 4 - val result = array.binarySearch(key, from, to) -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt deleted file mode 100644 index 72e255cabae..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt +++ /dev/null @@ -1,9 +0,0 @@ -// WITH_RUNTIME -fun test() { - val a = arrayOf(2) - val b = arrayOf(4) - val aOffset = 1 - val bOffset = 2 - val len = 5 - java.lang.System.arraycopy(a, aOffset, b, bOffset, len) -} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt.after b/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt.after deleted file mode 100644 index c888c46c89f..00000000000 --- a/idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt.after +++ /dev/null @@ -1,9 +0,0 @@ -// WITH_RUNTIME -fun test() { - val a = arrayOf(2) - val b = arrayOf(4) - val aOffset = 1 - val bOffset = 2 - val len = 5 - a.copyInto(b, bOffset, aOffset, len + aOffset) -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 50732e431b5..51192d667b9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -9061,16 +9061,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/asList.kt"); } - @TestMetadata("binarySearch.kt") - public void testBinarySearch() throws Exception { - runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch.kt"); - } - - @TestMetadata("binarySearch2.kt") - public void testBinarySearch2() throws Exception { - runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/binarySearch2.kt"); - } - @TestMetadata("copyOf.kt") public void testCopyOf() throws Exception { runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/copyOf.kt"); @@ -9438,11 +9428,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } - @TestMetadata("arraycopy.kt") - public void testArraycopy() throws Exception { - runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/arraycopy.kt"); - } - @TestMetadata("exit.kt") public void testExit() throws Exception { runTest("idea/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/system/exit.kt");