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

Minor refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-08-11 21:07:27 +03:00
parent 407a3ddc8a
commit 50cd61ec9f
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt
+2 -5
View File
@@ -215,7 +215,7 @@ class FilterToTransformation private constructor(
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = if (indexVariable != null) val lambda = if (indexVariable != null)
generateLambda(effectiveCondition(), indexVariable, inputVariable) generateLambda(inputVariable, indexVariable, effectiveCondition())
else else
generateLambda(inputVariable, condition) generateLambda(inputVariable, condition)
return chainedCallGenerator.generate("$functionName($0) $1:'{}'", targetCollection, lambda) return chainedCallGenerator.generate("$functionName($0) $1:'{}'", targetCollection, lambda)
@@ -289,10 +289,7 @@ class MapToTransformation private constructor(
get() = "$functionName(){}" get() = "$functionName(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = if (indexVariable != null) val lambda = generateLambda(inputVariable, indexVariable, mapping)
generateLambda(mapping, indexVariable, inputVariable)
else
generateLambda(inputVariable, mapping)
return chainedCallGenerator.generate("$functionName($0) $1:'{}'", targetCollection, lambda) return chainedCallGenerator.generate("$functionName($0) $1:'{}'", targetCollection, lambda)
} }
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/ForEachTransformation.kt
+1 -4
View File
@@ -34,10 +34,7 @@ class ForEachTransformation(
get() = functionName + "{}" get() = functionName + "{}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = if (indexVariable != null) val lambda = generateLambda(inputVariable, indexVariable, statement)
generateLambda(statement, indexVariable, inputVariable)
else
generateLambda(inputVariable, statement)
return chainedCallGenerator.generate("$functionName $0:'{}'", lambda) return chainedCallGenerator.generate("$functionName $0:'{}'", lambda)
} }
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FilterTransformation.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class FilterTransformation(
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = if (indexVariable != null) val lambda = if (indexVariable != null)
generateLambda(effectiveCondition(), indexVariable, inputVariable) generateLambda(inputVariable, indexVariable, effectiveCondition())
else else
generateLambda(inputVariable, condition) generateLambda(inputVariable, condition)
return chainedCallGenerator.generate("$0$1:'{}'", functionName, lambda) return chainedCallGenerator.generate("$0$1:'{}'", functionName, lambda)
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/MapTransformation.kt
+1 -4
View File
@@ -40,10 +40,7 @@ class MapTransformation(
get() = "$functionName{}" get() = "$functionName{}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression { override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = if (indexVariable != null) val lambda = generateLambda(inputVariable, indexVariable, mapping)
generateLambda(mapping, indexVariable, inputVariable)
else
generateLambda(inputVariable, mapping)
return chainedCallGenerator.generate("$functionName$0:'{}'", lambda) return chainedCallGenerator.generate("$functionName$0:'{}'", lambda)
} }
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/utils.kt
+5 -1
View File
@@ -66,7 +66,11 @@ fun generateLambda(inputVariable: KtCallableDeclaration, expression: KtExpressio
return psiFactory.createExpressionByPattern("{ $0 }", lambdaExpression.bodyExpression!!) as KtLambdaExpression return psiFactory.createExpressionByPattern("{ $0 }", lambdaExpression.bodyExpression!!) as KtLambdaExpression
} }
fun generateLambda(expression: KtExpression, indexVariable: KtCallableDeclaration, inputVariable: KtCallableDeclaration): KtLambdaExpression { fun generateLambda(inputVariable: KtCallableDeclaration, indexVariable: KtCallableDeclaration?, expression: KtExpression): KtLambdaExpression {
if (indexVariable == null) {
return generateLambda(inputVariable, expression)
}
val lambdaExpression = generateLambda(expression, *arrayOf(indexVariable, inputVariable)) val lambdaExpression = generateLambda(expression, *arrayOf(indexVariable, inputVariable))
// replace "index++" with "index" or "index + 1" (see IntroduceIndexMatcher) // replace "index++" with "index" or "index + 1" (see IntroduceIndexMatcher)