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

Fixed bug found because of incorrect test fixed

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-21 23:02:05 +03:00
parent 21c2268f70
commit 6baf633a8d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/sequence/FilterTransformation.kt
+4
View File
@@ -115,6 +115,10 @@ class FilterTransformation(
val condition = ifStatement.condition ?: return null val condition = ifStatement.condition ?: return null
val then = ifStatement.then ?: return null val then = ifStatement.then ?: return null
// we do not allow filter() which uses neither input variable nor index variable (though is technically possible but looks confusing)
// shouldUseInputVariables = false does not work for us because we sometimes return Result match in this matcher
if (!state.inputVariable.hasUsages(condition) && (state.indexVariable == null || !state.indexVariable.hasUsages(condition))) return null
if (state.statements.size == 1) { if (state.statements.size == 1) {
val transformation = createFilterTransformation(state.outerLoop, state.inputVariable, state.indexVariable, condition, isInverse = false) val transformation = createFilterTransformation(state.outerLoop, state.inputVariable, state.indexVariable, condition, isInverse = false)
val newState = state.copy(statements = listOf(then)) val newState = state.copy(statements = listOf(then))