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] "Java methods should be replaced with Kotlin analog": add special handling for functions that change semantics

Browse Source 
^KTIJ-25643 Fixed
^KTIJ-25633 Fixed

GitOrigin-RevId: f93cf6690484eeb10e3a6261c68da98c5dedc0f7
This commit is contained in:
Alexey Belkov
2023-05-25 15:59:01 +00:00
committed by intellij-monorepo-bot
parent b67f1571a5
commit 2099cf697d
7 changed files with 26 additions and 12 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
+20 -8
View File
@@ -1,21 +1,24 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.idea.inspections.jdk2k
import com.intellij.codeInsight.intention.FileModifier
import com.intellij.codeInspection.LocalQuickFix
import com.intellij.codeInspection.ProblemDescriptor
import com.intellij.codeInspection.ProblemHighlightType.GENERIC_ERROR_OR_WARNING
import com.intellij.codeInspection.ProblemHighlightType.INFORMATION
import com.intellij.codeInspection.ProblemsHolder
import com.intellij.java.JavaBundle
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.config.ApiVersion.Companion.KOTLIN_1_8
import org.jetbrains.kotlin.idea.base.projectStructure.languageVersionSettings
import org.jetbrains.kotlin.idea.base.psi.textRangeIn
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
import org.jetbrains.kotlin.idea.codeinsight.api.classic.inspections.AbstractKotlinInspection
import org.jetbrains.kotlin.idea.inspections.collections.isCalling
import org.jetbrains.kotlin.idea.base.psi.textRangeIn
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
@@ -46,16 +49,24 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
?.map(::ReplaceWithKotlinAnalogFunction)
?.toTypedArray() ?: return
val highlightType = if (replacements.any { it.mayChangeSemantics }) INFORMATION else GENERIC_ERROR_OR_WARNING
holder.registerProblem(
call,
callee.textRangeIn(call),
KotlinBundle.message("should.be.replaced.with.kotlin.function"),
highlightType,
callee.textRangeIn(call),
*replacements
)
})
private class ReplaceWithKotlinAnalogFunction(private val replacement: Replacement) : LocalQuickFix {
override fun getName() = KotlinBundle.message("replace.with.kotlin.analog.function.text", replacement.kotlinFunctionShortName)
val mayChangeSemantics: Boolean
get() = replacement.mayChangeSemantics
override fun getName(): String {
val suffix = if (mayChangeSemantics) JavaBundle.message("quickfix.text.suffix.may.change.semantics") else ""
return KotlinBundle.message("replace.with.kotlin.analog.function.text", replacement.kotlinFunctionShortName) + suffix
}
override fun getFamilyName() = KotlinBundle.message("replace.with.kotlin.analog.function.family.name")
@@ -144,8 +155,8 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
Replacement("java.lang.Math.nextUp", "kotlin.math.nextUp", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.lang.Math.pow", "kotlin.math.pow", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.lang.Math.rint", "kotlin.math.round"),
Replacement("java.lang.Math.round", "kotlin.math.roundToLong", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.lang.Math.round", "kotlin.math.roundToInt", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.lang.Math.round", "kotlin.math.roundToLong", ToExtensionFunctionWithNonNullableReceiver, mayChangeSemantics = true),
Replacement("java.lang.Math.round", "kotlin.math.roundToInt", ToExtensionFunctionWithNonNullableReceiver, mayChangeSemantics = true),
Replacement("java.lang.Math.signum", "kotlin.math.sign"),
Replacement("java.lang.Math.sin", "kotlin.math.sin"),
Replacement("java.lang.Math.sinh", "kotlin.math.sinh"),
@@ -160,7 +171,7 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
Replacement("java.util.Arrays.copyOf", "kotlin.collections.copyOf", ToExtensionFunctionWithNonNullableReceiver) {
it.valueArguments.size == 2
},
Replacement("java.util.Arrays.copyOfRange", "kotlin.collections.copyOfRange", ToExtensionFunctionWithNonNullableReceiver),
Replacement("java.util.Arrays.copyOfRange", "kotlin.collections.copyOfRange", ToExtensionFunctionWithNonNullableReceiver, mayChangeSemantics = true),
Replacement("java.util.Arrays.equals", "kotlin.collections.contentEquals", ToExtensionFunctionWithNullableReceiver) {
it.valueArguments.size == 2
},
@@ -185,7 +196,7 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
Replacement("java.util.List.of", "kotlin.collections.mutableListOf")
)
val REPLACEMENTS = (JAVA_MATH + JAVA_SYSTEM + JAVA_IO + JAVA_PRIMITIVES + JAVA_COLLECTIONS)
val REPLACEMENTS: Map<String, List<Replacement>> = (JAVA_MATH + JAVA_SYSTEM + JAVA_IO + JAVA_PRIMITIVES + JAVA_COLLECTIONS)
.groupBy { it.javaMethodShortName }
}
}
@@ -195,6 +206,7 @@ data class Replacement(
val javaMethodFqName: String,
val kotlinFunctionFqName: String,
val transformation: Transformation = WithoutAdditionalTransformation,
val mayChangeSemantics: Boolean = false,
val filter: (KtCallExpression) -> Boolean = { true }
) {
private fun String.shortName() = takeLastWhile { it != '.' }
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/copyOfRange.kt
+1
View File
@@ -1,3 +1,4 @@
// FIX: Replace with 'copyOfRange' function (may change semantics)
// WITH_STDLIB
import java.util.Arrays
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/collections/copyOfRange.kt.after
+1
View File
@@ -1,3 +1,4 @@
// FIX: Replace with 'copyOfRange' function (may change semantics)
// WITH_STDLIB
import java.util.Arrays
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/math/roundToInt.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// FIX: Replace with 'roundToInt' function
// FIX: Replace with 'roundToInt' function (may change semantics)
// WITH_STDLIB
fun test(x: Double) {
Math.<caret>round(x)
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/math/roundToInt.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
import kotlin.math.roundToInt
// FIX: Replace with 'roundToInt' function
// FIX: Replace with 'roundToInt' function (may change semantics)
// WITH_STDLIB
fun test(x: Double) {
x.roundToInt()
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/math/roundToLong.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// FIX: Replace with 'roundToLong' function
// FIX: Replace with 'roundToLong' function (may change semantics)
// WITH_STDLIB
fun test(x: Double) {
Math.<caret>round(x)
plugins/kotlin/idea/tests/testData/inspectionsLocal/replaceJavaStaticMethodWithKotlinAnalog/math/roundToLong.kt.after
+1 -1
View File
@@ -1,6 +1,6 @@
import kotlin.math.roundToLong
// FIX: Replace with 'roundToLong' function
// FIX: Replace with 'roundToLong' function (may change semantics)
// WITH_STDLIB
fun test(x: Double) {
x.roundToLong()