From 22c5e208a6a06793b186c0503f09d053e4207f16 Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Tue, 23 Jul 2019 00:27:28 +0900 Subject: [PATCH] ReplaceGuardClause inspection: do not report when 'if' expression is used as expression --- .../ReplaceGuardClauseWithFunctionCallInspection.kt | 4 +++- .../idea/inspections/LocalInspectionTestGenerated.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt index 6fb89fc2f96..f218e816a9d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.startOffset +import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getType import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe @@ -58,9 +59,10 @@ class ReplaceGuardClauseWithFunctionCallInspection : AbstractApplicabilityBasedI val valueArguments = call.valueArguments if (valueArguments.size > 1) return false if (calleeText != ILLEGAL_STATE_EXCEPTION && calleeText != ILLEGAL_ARGUMENT_EXCEPTION) return false - val context = call.analyze(BodyResolveMode.PARTIAL) + val context = call.analyze(BodyResolveMode.PARTIAL_WITH_CFA) val argumentType = valueArguments.firstOrNull()?.getArgumentExpression()?.getType(context) if (argumentType != null && !KotlinBuiltIns.isStringOrNullableString(argumentType)) return false + if (element.isUsedAsExpression(context)) return false val fqName = call.getResolvedCall(context)?.resultingDescriptor?.fqNameSafe?.parent() return fqName == FqName("kotlin.$calleeText") || fqName == FqName("java.lang.$calleeText") } diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index ead7dd4a94c..6ae36d4bb08 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -8934,6 +8934,11 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { runTest("idea/testData/inspectionsLocal/replaceGuardClauseWithFunctionCall/notTargetException.kt"); } + @TestMetadata("usedAsExpression.kt") + public void testUsedAsExpression() throws Exception { + runTest("idea/testData/inspectionsLocal/replaceGuardClauseWithFunctionCall/usedAsExpression.kt"); + } + @TestMetadata("version12.kt") public void testVersion12() throws Exception { runTest("idea/testData/inspectionsLocal/replaceGuardClauseWithFunctionCall/version12.kt");