From 7611f480c1cac70500f7887c2b8dbd1f2b76d0ef Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 21 Jul 2015 13:26:13 +0300 Subject: [PATCH] More consistent intention texts --- .../idea/intentions/AddForLoopIndicesIntention.kt | 2 +- .../intentions/ConvertForEachToForLoopIntention.kt | 2 +- .../idea/intentions/RemoveForLoopIndicesIntention.kt | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt index 5fc9b1a092c..14188c8b707 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -public class AddForLoopIndicesIntention : JetSelfTargetingRangeIntention(javaClass(), "Add indices to 'for' loop"), LowPriorityAction { +public class AddForLoopIndicesIntention : JetSelfTargetingRangeIntention(javaClass(), "Add indices to for-loop"), LowPriorityAction { private val WITH_INDEX_FQ_NAME = "kotlin.withIndex" override fun applicabilityRange(element: JetForExpression): TextRange? { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt index 8d0a2966598..0b6d56a50d2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver -public class ConvertForEachToForLoopIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace with a for loop") { +public class ConvertForEachToForLoopIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace with a for-loop") { override fun isApplicableTo(element: JetSimpleNameExpression): Boolean { if (element.getReferencedName() != "forEach") return false diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt index 649db97d58f..af0b5a4d853 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt @@ -16,19 +16,18 @@ package org.jetbrains.kotlin.idea.intentions -import com.intellij.find.FindManager -import com.intellij.find.impl.FindManagerImpl import com.intellij.openapi.editor.Editor import com.intellij.psi.search.searches.ReferencesSearch -import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions -import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.JetCallExpression +import org.jetbrains.kotlin.psi.JetDotQualifiedExpression +import org.jetbrains.kotlin.psi.JetForExpression +import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorUtils public class RemoveForLoopIndicesIntention : JetSelfTargetingIntention( - javaClass(), "Remove indices in 'for' loop") { + javaClass(), "Remove indices in for-loop") { override fun applyTo(element: JetForExpression, editor: Editor) { val parameter = element.getMultiParameter()!! val range = element.getLoopRange() as JetDotQualifiedExpression