From acdf9e82b4861081979cf881ccf19d9c0b43f5bb Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 10 Aug 2016 18:10:43 +0300 Subject: [PATCH] Minor --- .../result/FindTransformationMatcher.kt | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt index 69ce5f1d9da..c4fa61e24ff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindTransformationMatcher.kt @@ -330,29 +330,26 @@ object FindTransformationMatcher : TransformationMatcher { filter: KtExpression?, negated: Boolean ): FindOperationGenerator { - if (filter != null) { - val containsArgument = filter.isFilterForContainsOperation(inputVariable, loop) - if (containsArgument != null) { - val generator = SimpleGenerator("contains", inputVariable, null, containsArgument) - if (negated) { - return object : FindOperationGenerator(generator) { - override fun generate(chainedCallGenerator: ChainedCallGenerator): KtExpression { - return generator.generate(chainedCallGenerator).negate() - } + if (filter == null) { + return SimpleGenerator(if (negated) "none" else "any", inputVariable, filter) + } + + val containsArgument = filter.isFilterForContainsOperation(inputVariable, loop) + if (containsArgument != null) { + val generator = SimpleGenerator("contains", inputVariable, null, containsArgument) + if (negated) { + return object : FindOperationGenerator(generator) { + override fun generate(chainedCallGenerator: ChainedCallGenerator): KtExpression { + return generator.generate(chainedCallGenerator).negate() } } - else { - return generator - } + } + else { + return generator } } - if (negated) { - return SimpleGenerator("none", inputVariable, filter) - } - else { - return SimpleGenerator("any", inputVariable, filter) - } + return SimpleGenerator(if (negated) "none" else "any", inputVariable, filter) } private fun KtExpression.isFilterForContainsOperation(inputVariable: KtCallableDeclaration, loop: KtForExpression): KtExpression? {