From 8e16ddb00e9c1ab1e66171509461a336947f31f9 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 14 May 2015 12:01:49 +0300 Subject: [PATCH] Minor --- .../kotlin/idea/inspections/IntentionBasedInspection.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt index d94a7e20236..0f2cb993a8b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt @@ -39,9 +39,10 @@ public abstract class IntentionBasedInspection( val intention: JetSelfTargetingRangeIntention, val targetElement: T ): LocalQuickFix { + // store text into variable because intention instance is shared and may change its text later private val text = intention.getText() - override fun getFamilyName() = getName() + override fun getFamilyName() = intention.getFamilyName() override fun getName() = text @@ -62,13 +63,11 @@ public abstract class IntentionBasedInspection( val ranges = intentions .map { - val range = it.applicabilityRange(targetElement) - if (range != null) { + it.applicabilityRange(targetElement)?.let { range -> val elementRange = targetElement.getTextRange() - assert(range in elementRange, "Wrong applicabilityRange() result for $it - should be within element's range") + assert(range in elementRange) { "Wrong applicabilityRange() result for $it - should be within element's range" } range.shiftRight(-elementRange.getStartOffset()) } - else null } .filterNotNull() if (ranges.isEmpty()) return