jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-23 08:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging subsequent .filter()'s

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-05 22:39:08 +03:00
parent 6dbd9c944a
commit fcbf68617e
11 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/interfaces.kt
View File

@@ -30,6 +30,8 @@ interface Transformation {
}
interface SequenceTransformation : Transformation {
fun mergeWithPrevious(previousTransformation: SequenceTransformation): SequenceTransformation? = null
val affectsIndex: Boolean
fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression

31
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/matchAndConvert.kt
View File

@@ -71,8 +71,9 @@ fun match(loop: KtForExpression): ResultTransformationMatch? {
val match = matcher.match(state)
if (match != null) {
sequenceTransformations.addAll(match.sequenceTransformations)
val resultMatch = ResultTransformationMatch(match.resultTransformation, sequenceTransformations)
return resultMatch.check { checkSmartCastsPreserved(loop, it) }
return ResultTransformationMatch(match.resultTransformation, sequenceTransformations)
.let { mergeTransformations(it) }
.check { checkSmartCastsPreserved(loop, it) }
}
}
@@ -182,3 +183,29 @@ private fun ResultTransformationMatch.generateCallChain(loop: KtForExpression):
return callChain
}
private fun mergeTransformations(match: ResultTransformationMatch): ResultTransformationMatch {
val transformations = ArrayList<Transformation>().apply { addAll(match.sequenceTransformations); add(match.resultTransformation) }
var anyChange: Boolean
do {
anyChange = false
for (index in 0..transformations.lastIndex - 1) {
val transformation = transformations[index] as SequenceTransformation
val next = transformations[index + 1]
val merged = when (next) {
is SequenceTransformation -> next.mergeWithPrevious(transformation)
is ResultTransformation -> next.mergeWithPrevious(transformation)
else -> error("Unknown transformation type: $next")
} ?: continue
transformations[index] = merged
transformations.removeAt(index + 1)
anyChange = true
break
}
} while(anyChange)
@Suppress("UNCHECKED_CAST")
return ResultTransformationMatch(transformations.last() as ResultTransformation, transformations.dropLast(1) as List<SequenceTransformation>)
}

2
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindAndAssignTransformation.kt
View File

@@ -34,7 +34,7 @@ class FindAndAssignTransformation(
override fun mergeWithPrevious(previousTransformation: SequenceTransformation): ResultTransformation? {
if (previousTransformation !is FilterTransformation) return null
if (filter != null) return null //TODO
assert(filter == null) { "Should not happen because no 2 consecutive FilterTransformation's possible"}
return FindAndAssignTransformation(loop, previousTransformation.inputVariable, stdlibFunName, initialDeclaration, previousTransformation.buildRealCondition())
}

2
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/FindAndReturnTransformation.kt
View File

@@ -34,7 +34,7 @@ class FindAndReturnTransformation(
override fun mergeWithPrevious(previousTransformation: SequenceTransformation): ResultTransformation? {
if (previousTransformation !is FilterTransformation) return null
if (filter != null) return null //TODO
assert(filter == null) { "Should not happen because no 2 consecutive FilterTransformation's possible"}
return FindAndReturnTransformation(loop, previousTransformation.inputVariable, stdlibFunName, endReturn, previousTransformation.buildRealCondition())
}

13
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FilterTransformation.kt
View File

@@ -29,12 +29,16 @@ class FilterTransformation(
val isInverse: Boolean
) : SequenceTransformation {
init {
assert(condition.isPhysical)
}
fun buildRealCondition() = if (isInverse) condition.negate() else condition
override fun mergeWithPrevious(previousTransformation: SequenceTransformation): SequenceTransformation? {
if (previousTransformation !is FilterTransformation) return null
assert(previousTransformation.inputVariable == inputVariable)
val mergedCondition = KtPsiFactory(condition).createExpressionByPattern(
"$0 && $1", previousTransformation.buildRealCondition(), buildRealCondition())
return FilterTransformation(inputVariable, mergedCondition, isInverse = false) //TODO: build filterNot in some cases?
}
override val affectsIndex: Boolean
get() = true
@@ -44,7 +48,6 @@ class FilterTransformation(
return chainedCallGenerator.generate("$0$1:'{}'", name, lambda)
}
//TODO: merge subsequent filters
/**
* Matches:
* for (...) {

4
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FlatMapTransformation.kt
View File

@@ -30,10 +30,6 @@ class FlatMapTransformation(
private val transform: KtExpression
) : SequenceTransformation {
init {
assert(transform.isPhysical)
}
override val affectsIndex: Boolean
get() = true

4
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/MapTransformation.kt
View File

@@ -26,10 +26,6 @@ class MapTransformation(
val mapping: KtExpression
) : SequenceTransformation {
init {
assert(mapping.isPhysical)
}
override val affectsIndex: Boolean
get() = false

12
idea/testData/intentions/loopToCallChain/filter_mergeMultiple.kt vendored Normal file
View File

@@ -0,0 +1,12 @@
// WITH_RUNTIME
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) continue
if (s.length < 10 && s != "abc") {
if (s == "def") continue
val s1 = s + "x"
return s1
}
}
return null
}

7
idea/testData/intentions/loopToCallChain/filter_mergeMultiple.kt.after vendored Normal file
View File

@@ -0,0 +1,7 @@
// WITH_RUNTIME
fun foo(list: List<String>): String? {
return list
.filter { !it.isEmpty() && it.length < 10 && it != "abc" && it != "def" }
.map { it + "x" }
.firstOrNull()
}

11
idea/testData/intentions/loopToCallChain/firstOrNull_withMergedFilter.kt vendored Normal file
View File

@@ -0,0 +1,11 @@
// WITH_RUNTIME
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) continue
if (s.length < 10 && s != "abc") {
if (s == "def") continue
return s
}
}
return null
}

4
idea/testData/intentions/loopToCallChain/firstOrNull_withMergedFilter.kt.after vendored Normal file
View File

@@ -0,0 +1,4 @@
// WITH_RUNTIME
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull { !it.isEmpty() && it.length < 10 && it != "abc" && it != "def" }
}