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

ReplaceJavaStaticMethodWithKotlinAnalogInspection: rename isApplicable(call, context) to isApplicableInContext

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-10 11:14:14 +03:00
parent 71c0b3caa0
commit 82bf21f195
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt
+6 -1
View File
@@ -31,7 +31,12 @@ class ReplaceJavaStaticMethodWithKotlinAnalogInspection : AbstractKotlinInspecti
?.let { list -> ?.let { list ->
val context = call.analyze(BodyResolveMode.PARTIAL) val context = call.analyze(BodyResolveMode.PARTIAL)
val callDescriptor = call.getResolvedCall(context) ?: return val callDescriptor = call.getResolvedCall(context) ?: return
list.filter { callDescriptor.isCalling(FqName(it.javaMethodFqName)) && it.transformation.isApplicable(call, context) } list.filter {
callDescriptor.isCalling(FqName(it.javaMethodFqName)) && it.transformation.isApplicableInContext(
call,
context
)
}
} }
?.takeIf { it.isNotEmpty() } ?.takeIf { it.isNotEmpty() }
?.map(::ReplaceWithKotlinAnalogFunction) ?.map(::ReplaceWithKotlinAnalogFunction)
idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/Transformation.kt
+4 -3
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.types.isNullable
interface Transformation { interface Transformation {
operator fun invoke(callExpression: KtCallExpression, replacement: Replacement) operator fun invoke(callExpression: KtCallExpression, replacement: Replacement)
fun isApplicable(callExpression: KtCallExpression): Boolean = true fun isApplicable(callExpression: KtCallExpression): Boolean = true
fun isApplicable(callExpression: KtCallExpression, context: BindingContext): Boolean = true fun isApplicableInContext(callExpression: KtCallExpression, context: BindingContext): Boolean = true
} }
object WithoutAdditionalTransformation : Transformation { object WithoutAdditionalTransformation : Transformation {
@@ -55,7 +55,7 @@ object ToExtensionFunctionWithNonNullableReceiver : Transformation {
override fun isApplicable(callExpression: KtCallExpression): Boolean = callExpression.valueArguments.isNotEmpty() override fun isApplicable(callExpression: KtCallExpression): Boolean = callExpression.valueArguments.isNotEmpty()
override fun isApplicable(callExpression: KtCallExpression, context: BindingContext): Boolean = callExpression override fun isApplicableInContext(callExpression: KtCallExpression, context: BindingContext): Boolean = callExpression
.valueArguments.firstOrNull() .valueArguments.firstOrNull()
?.getArgumentExpression() ?.getArgumentExpression()
?.getType(context) ?.getType(context)
@@ -72,7 +72,8 @@ object ToExtensionFunctionWithNonNullableArguments : Transformation {
callExpression callExpression
) )
override fun isApplicable(callExpression: KtCallExpression, context: BindingContext): Boolean = callExpression.valueArguments.all { override fun isApplicableInContext(callExpression: KtCallExpression, context: BindingContext): Boolean = callExpression
.valueArguments.all {
it.getArgumentExpression()?.getType(context)?.isNullable() == false it.getArgumentExpression()?.getType(context)?.isNullable() == false
} }
} }