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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-22 12:20:23 +03:00
parent 4efc8fa2b1
commit 9ea6341d46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FlatMapTransformation.kt
+3 -3
View File
@@ -61,7 +61,7 @@ class FlatMapTransformation(
if (iterableType.checkIsSuperTypeOf(nestedSequenceType) == null) return null if (iterableType.checkIsSuperTypeOf(nestedSequenceType) == null) return null
val nestedLoopBody = nestedLoop.body ?: return null val nestedLoopBody = nestedLoop.body ?: return null
val newWorkingVariable = nestedLoop.loopParameter ?: return null val newInputVariable = nestedLoop.loopParameter ?: return null
if (state.indexVariable != null && state.indexVariable.hasUsages(transform)) { if (state.indexVariable != null && state.indexVariable.hasUsages(transform)) {
// if nested loop range uses index, convert to "mapIndexed {...}.flatMap { it }" // if nested loop range uses index, convert to "mapIndexed {...}.flatMap { it }"
@@ -71,7 +71,7 @@ class FlatMapTransformation(
val newState = state.copy( val newState = state.copy(
innerLoop = nestedLoop, innerLoop = nestedLoop,
statements = listOf(nestedLoopBody), statements = listOf(nestedLoopBody),
inputVariable = newWorkingVariable inputVariable = newInputVariable
) )
return SequenceTransformationMatch(listOf(mapIndexedTransformation, flatMapTransformation), newState) return SequenceTransformationMatch(listOf(mapIndexedTransformation, flatMapTransformation), newState)
} }
@@ -80,7 +80,7 @@ class FlatMapTransformation(
val newState = state.copy( val newState = state.copy(
innerLoop = nestedLoop, innerLoop = nestedLoop,
statements = listOf(nestedLoopBody), statements = listOf(nestedLoopBody),
inputVariable = newWorkingVariable inputVariable = newInputVariable
) )
return SequenceTransformationMatch(transformation, newState) return SequenceTransformationMatch(transformation, newState)
} }