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

Reformat: AddForLoopIndicesIntention

Browse Source
This commit is contained in:
Toshiaki Kameyama
2018-06-02 08:35:46 +03:00
committed by Mikhail Glukhikh
parent 2669193755
commit 752c576e20
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt
+11 -6
View File
@@ -31,7 +31,8 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(KtForExpression::class.java, "Add indices to 'for' loop"), LowPriorityAction { class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(KtForExpression::class.java, "Add indices to 'for' loop"),
LowPriorityAction {
private val WITH_INDEX_NAME = "withIndex" private val WITH_INDEX_NAME = "withIndex"
private val WITH_INDEX_FQ_NAMES = listOf("collections", "sequences", "text", "ranges").map { "kotlin.$it.$WITH_INDEX_NAME" }.toSet() private val WITH_INDEX_FQ_NAMES = listOf("collections", "sequences", "text", "ranges").map { "kotlin.$it.$WITH_INDEX_NAME" }.toSet()
@@ -61,7 +62,10 @@ class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(
loopRange.replace(createWithIndexExpression(loopRange, reformat = true)) loopRange.replace(createWithIndexExpression(loopRange, reformat = true))
var multiParameter = (psiFactory.createExpressionByPattern("for((index, $0) in x){}", loopParameter.text) as KtForExpression).destructuringDeclaration!! var multiParameter = (psiFactory.createExpressionByPattern(
"for((index, $0) in x){}",
loopParameter.text
) as KtForExpression).destructuringDeclaration!!
multiParameter = loopParameter.replaced(multiParameter) multiParameter = loopParameter.replaced(multiParameter)
@@ -83,8 +87,7 @@ class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(
val statement = body.statements.firstOrNull() val statement = body.statements.firstOrNull()
if (statement != null) { if (statement != null) {
templateBuilder.setEndVariableBefore(statement) templateBuilder.setEndVariableBefore(statement)
} } else {
else {
templateBuilder.setEndVariableAfter(body.lBrace) templateBuilder.setEndVariableAfter(body.lBrace)
} }
} }
@@ -98,7 +101,9 @@ class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(
} }
private fun createWithIndexExpression(originalExpression: KtExpression, reformat: Boolean): KtExpression { private fun createWithIndexExpression(originalExpression: KtExpression, reformat: Boolean): KtExpression {
return KtPsiFactory(originalExpression).createExpressionByPattern("$0.$WITH_INDEX_NAME()", originalExpression, return KtPsiFactory(originalExpression).createExpressionByPattern(
reformat = reformat) "$0.$WITH_INDEX_NAME()", originalExpression,
reformat = reformat
)
} }
} }