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

Moved check about old working variable not needed into common place

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-06 16:41:17 +03:00
parent 22fb397662
commit df08493337
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/matchAndConvert.kt
+5 -1
View File
@@ -82,8 +82,12 @@ fun match(loop: KtForExpression): ResultTransformationMatch? {
for (matcher in MatcherRegistrar.sequenceMatchers) { for (matcher in MatcherRegistrar.sequenceMatchers) {
val match = matcher.match(state) val match = matcher.match(state)
if (match != null) { if (match != null) {
val newState = match.newState
// check that old working variable is not needed anymore
if (state.workingVariable != newState.workingVariable && state.workingVariable.hasUsages(newState.statements)) return null
sequenceTransformations.addAll(match.transformations) sequenceTransformations.addAll(match.transformations)
state = match.newState state = newState
continue@MatchLoop continue@MatchLoop
} }
} }
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FlatMapTransformation.kt
-1
View File
@@ -61,7 +61,6 @@ 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
if (state.workingVariable.hasUsages(nestedLoopBody)) return null // workingVariable is still needed - cannot transform
val newWorkingVariable = nestedLoop.loopParameter ?: return null val newWorkingVariable = nestedLoop.loopParameter ?: return null
val transformation = FlatMapTransformation(state.workingVariable, transform) val transformation = FlatMapTransformation(state.workingVariable, transform)
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/MapTransformation.kt
-1
View File
@@ -49,7 +49,6 @@ class MapTransformation(
val initializer = declaration.initializer ?: return null val initializer = declaration.initializer ?: return null
if (declaration.hasWriteUsages()) return null if (declaration.hasWriteUsages()) return null
val restStatements = state.statements.drop(1) val restStatements = state.statements.drop(1)
if (state.workingVariable.hasUsages(restStatements)) return null // workingVariable is still needed - cannot transform to map()
val transformation = MapTransformation(state.workingVariable, initializer) val transformation = MapTransformation(state.workingVariable, initializer)
val newState = state.copy(statements = restStatements, workingVariable = declaration) val newState = state.copy(statements = restStatements, workingVariable = declaration)