From a3a3c52c24c335e94ad141c2e931168e0f2a67f6 Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Mon, 22 Jul 2019 18:51:17 +0900 Subject: [PATCH] ReplaceGuardClause inspection: fix highlight range --- .../ReplaceGuardClauseWithFunctionCallInspection.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt index ce7531d011d..bbeef6ee54f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceGuardClauseWithFunctionCallInspection.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.intentions.callExpression import org.jetbrains.kotlin.idea.project.languageVersionSettings import org.jetbrains.kotlin.idea.util.CommentSaver +import org.jetbrains.kotlin.idea.util.textRangeIn import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -45,6 +46,8 @@ class ReplaceGuardClauseWithFunctionCallInspection : AbstractApplicabilityBasedI override fun fixText(element: KtIfExpression) = element.getKotlinFunction()?.let { "Replace with '${it.functionName}()' call" } ?: defaultFixText + override fun inspectionHighlightRangeInElement(element: KtIfExpression) = element.ifKeyword.textRangeIn(element) + override fun isApplicable(element: KtIfExpression): Boolean { val languageVersionSettings = element.languageVersionSettings if (!languageVersionSettings.supportsFeature(LanguageFeature.UseReturnsEffect)) return false