jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-11 00:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

More informative intention action text

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-04-20 14:52:00 +03:00
parent bbb6ef4fbc
commit fe7ddbcc0d
135 changed files with 273 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/LoopToCallChainIntention.kt
View File

@@ -33,7 +33,23 @@ class LoopToCallChainIntention : SelfTargetingRangeIntention<KtForExpression>(
"Replace with stdlib operations"
) {
override fun applicabilityRange(element: KtForExpression): TextRange? {
return if (match(element) != null) element.forKeyword.textRange else null
val match = match(element)
text = if (match != null) "Replace with '${match.buildPresentation()}'" else defaultText
return if (match != null) element.forKeyword.textRange else null
}
private fun ResultTransformationMatch.buildPresentation(): String {
var transformations = sequenceTransformations + resultTransformation
val MAX = 3
var result: String? = null
if (transformations.size > MAX) {
transformations = transformations.drop(transformations.size - MAX)
result = ".."
}
for (transformation in transformations) {
result = transformation.buildPresentation(result)
}
return result!!
}
override fun applyTo(element: KtForExpression, editor: Editor?) {

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

@@ -40,6 +40,15 @@ interface Transformation {
val inputVariable: KtCallableDeclaration
val loop: KtForExpression
val presentation: String
open fun buildPresentation(prevTransformationsPresentation: String?): String {
return if (prevTransformationsPresentation != null)
prevTransformationsPresentation + "." + presentation
else
presentation
}
fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression
}

40
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/result/AddToCollectionTransformation.kt
View File

@@ -55,6 +55,16 @@ class AddToCollectionTransformation(
}
}
override val presentation: String
get() = "+="
override fun buildPresentation(prevTransformationsPresentation: String?): String {
return if (prevTransformationsPresentation != null)
"+= $prevTransformationsPresentation"
else
"+="
}
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return KtPsiFactory(loop).createExpressionByPattern("$0 += $1", targetCollection, chainedCallGenerator.receiver)
}
@@ -170,6 +180,9 @@ class FilterToTransformation private constructor(
private val filter: KtExpression
) : ReplaceLoopResultTransformation(loop, inputVariable) {
override val presentation: String
get() = "filterTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, filter)
return chainedCallGenerator.generate("filterTo($0) $1:'{}'", targetCollection, lambda)
@@ -200,6 +213,9 @@ class AssignFilterToTransformation(
private val filter: KtExpression
) : AssignToVariableResultTransformation(loop, inputVariable, targetCollectionInitialization) {
override val presentation: String
get() = "filterTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, filter)
return chainedCallGenerator.generate("filterTo($0) $1:'{}'", initialization.initializer, lambda)
@@ -213,6 +229,9 @@ class MapToTransformation private constructor(
private val mapping: KtExpression
) : ReplaceLoopResultTransformation(loop, inputVariable) {
override val presentation: String
get() = "mapTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, mapping)
return chainedCallGenerator.generate("mapTo($0) $1:'{}'", targetCollection, lambda)
@@ -243,6 +262,9 @@ class AssignMapToTransformation(
private val mapping: KtExpression
) : AssignToVariableResultTransformation(loop, inputVariable, targetCollectionInitialization) {
override val presentation: String
get() = "mapTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, mapping)
return chainedCallGenerator.generate("mapTo($0) $1:'{}'", initialization.initializer, lambda)
@@ -256,6 +278,9 @@ class FlatMapToTransformation private constructor(
private val transform: KtExpression
) : ReplaceLoopResultTransformation(loop, inputVariable) {
override val presentation: String
get() = "flatMapTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, transform)
return chainedCallGenerator.generate("flatMapTo($0) $1:'{}'", targetCollection, lambda)
@@ -286,6 +311,9 @@ class AssignFlatMapToTransformation(
private val transform: KtExpression
) : AssignToVariableResultTransformation(loop, inputVariable, targetCollectionInitialization) {
override val presentation: String
get() = "flatMapTo(){}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, transform)
return chainedCallGenerator.generate("flatMapTo($0) $1:'{}'", initialization.initializer, lambda)
@@ -298,6 +326,9 @@ class AssignToListTransformation(
initialization: VariableInitialization
) : AssignToVariableResultTransformation(loop, inputVariable, initialization) {
override val presentation: String
get() = "toList()"
override fun mergeWithPrevious(previousTransformation: SequenceTransformation): ResultTransformation? {
if (previousTransformation !is FilterTransformation) return null
return AssignSequenceTransformationResultTransformation(previousTransformation, initialization)
@@ -314,6 +345,9 @@ class AssignToMutableListTransformation(
initialization: VariableInitialization
) : AssignToVariableResultTransformation(loop, inputVariable, initialization) {
override val presentation: String
get() = "toMutableList()"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return chainedCallGenerator.generate("toMutableList()")
}
@@ -325,6 +359,9 @@ class AssignToSetTransformation(
initialization: VariableInitialization
) : AssignToVariableResultTransformation(loop, inputVariable, initialization) {
override val presentation: String
get() = "toSet()"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return chainedCallGenerator.generate("toSet()")
}
@@ -336,6 +373,9 @@ class AssignToMutableSetTransformation(
initialization: VariableInitialization
) : AssignToVariableResultTransformation(loop, inputVariable, initialization) {
override val presentation: String
get() = "toMutableSet()"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return chainedCallGenerator.generate("toMutableSet()")
}

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

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class FindAndAssignTransformation(
loop: KtForExpression,
inputVariable: KtCallableDeclaration,
private val generator: (chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?) -> KtExpression,
private val generator: FindOperatorGenerator,
initialization: VariableInitialization,
private val filter: KtExpression? = null
) : AssignToVariableResultTransformation(loop, inputVariable, initialization) {
@@ -40,8 +40,11 @@ class FindAndAssignTransformation(
return FindAndAssignTransformation(loop, previousTransformation.inputVariable, generator, initialization, previousTransformation.effectiveCondition())
}
override val presentation: String
get() = generator.functionName + (if (filter != null) "{}" else "()")
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return generator(chainedCallGenerator, filter)
return generator.generate(chainedCallGenerator, filter)
}
/**

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

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiChildRange
class FindAndReturnTransformation(
override val loop: KtForExpression,
override val inputVariable: KtCallableDeclaration,
private val generator: (chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?) -> KtExpression,
private val generator: FindOperatorGenerator,
private val endReturn: KtReturnExpression,
private val filter: KtExpression? = null
) : ResultTransformation {
@@ -44,8 +44,11 @@ class FindAndReturnTransformation(
override fun commentRestoringRange(convertLoopResult: KtExpression) = commentRestoringRange
override val presentation: String
get() = generator.functionName + (if (filter != null) "{}" else "()")
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return generator(chainedCallGenerator, filter)
return generator.generate(chainedCallGenerator, filter)
}
override fun convertLoop(resultCallChain: KtExpression): KtExpression {

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

@@ -43,6 +43,9 @@ class FilterTransformation(
override val affectsIndex: Boolean
get() = true
override val presentation: String
get() = if (isInverse) "filterNot{}" else "filter{}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, condition)
val name = if (isInverse) "filterNot" else "filter"
@@ -128,6 +131,9 @@ class FilterIsInstanceTransformation(
override val affectsIndex: Boolean
get() = true
override val presentation: String
get() = "filterIsInstance<>()"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return chainedCallGenerator.generate("filterIsInstance<$0>()", type)
}
@@ -141,6 +147,9 @@ class FilterNotNullTransformation(
override val affectsIndex: Boolean
get() = true
override val presentation: String
get() = "filterNotNull()"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return chainedCallGenerator.generate("filterNotNull()")
}

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

@@ -34,6 +34,9 @@ class FlatMapTransformation(
override val affectsIndex: Boolean
get() = true
override val presentation: String
get() = "flatMap{}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, transform)
return chainedCallGenerator.generate("flatMap$0:'{}'", lambda)

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

@@ -31,6 +31,9 @@ class MapTransformation(
override val affectsIndex: Boolean
get() = false
override val presentation: String
get() = "map{}"
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
val lambda = generateLambda(inputVariable, mapping)
return chainedCallGenerator.generate("map$0:'{}'", lambda)

81
idea/src/org/jetbrains/kotlin/idea/intentions/loopToCallChain/utils.kt
View File

@@ -112,12 +112,17 @@ fun KtProperty.hasWriteUsages(): Boolean {
}
}
interface FindOperatorGenerator {
val functionName: String
fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression
}
fun buildFindOperationGenerator(
valueIfFound: KtExpression,
valueIfNotFound: KtExpression,
inputVariable: KtCallableDeclaration,
findFirst: Boolean
): ((chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?) -> KtExpression)? {
): FindOperatorGenerator? {
assert(valueIfFound.isPhysical)
assert(valueIfNotFound.isPhysical)
@@ -131,36 +136,40 @@ fun buildFindOperationGenerator(
}
}
class SimpleGenerator(override val functionName: String) : FindOperatorGenerator {
override fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression {
return generateChainedCall(functionName, chainedCallGenerator, filter)
}
}
val inputVariableCanHoldNull = (inputVariable.resolveToDescriptor() as VariableDescriptor).type.nullability() != TypeNullability.NOT_NULL
fun ((chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?) -> KtExpression).useElvisOperatorIfNeeded(): ((chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?) -> KtExpression)? {
fun FindOperatorGenerator.useElvisOperatorIfNeeded(): FindOperatorGenerator? {
if (valueIfNotFound.isNullExpression()) return this
// we cannot use ?: if found value can be null
if (inputVariableCanHoldNull) return null
return { chainedCallGenerator, filter ->
val generated = this(chainedCallGenerator, filter)
KtPsiFactory(generated).createExpressionByPattern("$0 ?: $1", generated, valueIfNotFound)
return object: FindOperatorGenerator {
override val functionName: String
get() = this@useElvisOperatorIfNeeded.functionName
override fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression {
val generated = this@useElvisOperatorIfNeeded.generate(chainedCallGenerator, filter)
return KtPsiFactory(generated).createExpressionByPattern("$0 ?: $1", generated, valueIfNotFound)
}
}
}
when {
valueIfFound.isVariableReference(inputVariable) -> {
val stdlibFunName = if (findFirst) "firstOrNull" else "lastOrNull"
val generator = { chainedCallGenerator: ChainedCallGenerator, filter: KtExpression? ->
generateChainedCall(stdlibFunName, chainedCallGenerator, filter)
}
val generator = SimpleGenerator(if (findFirst) "firstOrNull" else "lastOrNull")
return generator.useElvisOperatorIfNeeded()
}
valueIfFound.isTrueConstant() && valueIfNotFound.isFalseConstant() -> {
return { chainedCallGenerator, filter -> generateChainedCall("any", chainedCallGenerator, filter) }
}
valueIfFound.isTrueConstant() && valueIfNotFound.isFalseConstant() -> return SimpleGenerator("any")
valueIfFound.isFalseConstant() && valueIfNotFound.isTrueConstant() -> {
return { chainedCallGenerator, filter -> generateChainedCall("none", chainedCallGenerator, filter) }
}
valueIfFound.isFalseConstant() && valueIfNotFound.isTrueConstant() -> return SimpleGenerator("none")
inputVariable.hasUsages(valueIfFound) -> {
if (!findFirst) return null // too dangerous because of side effects
@@ -171,9 +180,14 @@ fun buildFindOperationGenerator(
val receiver = qualifiedExpression.receiverExpression
val selector = qualifiedExpression.selectorExpression
if (receiver.isVariableReference(inputVariable) && selector != null && !inputVariable.hasUsages(selector)) {
return { chainedCallGenerator: ChainedCallGenerator, filter: KtExpression? ->
val findFirstCall = generateChainedCall("firstOrNull", chainedCallGenerator, filter)
KtPsiFactory(findFirstCall).createExpressionByPattern("$0?.$1", findFirstCall, selector)
return object: FindOperatorGenerator {
override val functionName: String
get() = "firstOrNull"
override fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression {
val findFirstCall = generateChainedCall(functionName, chainedCallGenerator, filter)
return KtPsiFactory(findFirstCall).createExpressionByPattern("$0?.$1", findFirstCall, selector)
}
}.useElvisOperatorIfNeeded()
}
}
@@ -181,17 +195,27 @@ fun buildFindOperationGenerator(
// in case of nullable input variable we cannot distinguish by the result of "firstOrNull" whether nothing was found or 'null' was found
if (inputVariableCanHoldNull) return null
return { chainedCallGenerator: ChainedCallGenerator, filter: KtExpression? ->
val findFirstCall = generateChainedCall("firstOrNull", chainedCallGenerator, filter)
val letBody = generateLambda(inputVariable, valueIfFound)
KtPsiFactory(findFirstCall).createExpressionByPattern("$0?.let $1:'{}'", findFirstCall, letBody)
return object: FindOperatorGenerator {
override val functionName: String
get() = "firstOrNull" //TODO
override fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression {
val findFirstCall = generateChainedCall(functionName, chainedCallGenerator, filter)
val letBody = generateLambda(inputVariable, valueIfFound)
return KtPsiFactory(findFirstCall).createExpressionByPattern("$0?.let $1:'{}'", findFirstCall, letBody)
}
}.useElvisOperatorIfNeeded()
}
else -> {
return { chainedCallGenerator, filter ->
val chainedCall = generateChainedCall("any", chainedCallGenerator, filter)
KtPsiFactory(chainedCall).createExpressionByPattern("if ($0) $1 else $2", chainedCall, valueIfFound, valueIfNotFound)
return object: FindOperatorGenerator {
override val functionName: String
get() = "any"
override fun generate(chainedCallGenerator: ChainedCallGenerator, filter: KtExpression?): KtExpression {
val chainedCall = generateChainedCall(functionName, chainedCallGenerator, filter)
return KtPsiFactory(chainedCall).createExpressionByPattern("if ($0) $1 else $2", chainedCall, valueIfFound, valueIfNotFound)
}
}
}
}
@@ -313,6 +337,13 @@ class AssignSequenceTransformationResultTransformation(
initialization: VariableInitialization
) : AssignToVariableResultTransformation(sequenceTransformation.loop, sequenceTransformation.inputVariable, initialization) {
override val presentation: String
get() = sequenceTransformation.presentation
override fun buildPresentation(prevTransformationsPresentation: String?): String {
return sequenceTransformation.buildPresentation(prevTransformationsPresentation)
}
override fun generateCode(chainedCallGenerator: ChainedCallGenerator): KtExpression {
return sequenceTransformation.generateCode(chainedCallGenerator)
}

1
idea/testData/intentions/loopToCallChain/addToCollection.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with '+='"
fun foo(list: List<String>, target: MutableList<String>) {
<caret>for (s in list) {
target.add(s)

1
idea/testData/intentions/loopToCallChain/addToCollection.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with '+='"
fun foo(list: List<String>, target: MutableList<String>) {
<caret>target += list
}

1
idea/testData/intentions/loopToCallChain/any_ifAssign.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
var found = false
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/any_ifAssign.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
<caret>val found = list.any { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/any_ifAssign_noBreak.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
var found = false
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/any_ifAssign_noBreak.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
<caret>val found = list.any { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/any_ifAssign_nonBooleanResult.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
var result = 0
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/any_ifAssign_nonBooleanResult.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>) {
<caret>val result = if (list.any { it.length > 0 }) 1 else 0
}

1
idea/testData/intentions/loopToCallChain/any_ifReturn.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>): Boolean {
<caret>for (s in list) {
if (s.length > 0) {

1
idea/testData/intentions/loopToCallChain/any_ifReturn.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>): Boolean {
<caret>return list.any { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/any_ifReturn_nonBooleanResult.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>): Int {
<caret>for (s in list) {
if (s.length > 0) {

1
idea/testData/intentions/loopToCallChain/any_ifReturn_nonBooleanResult.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any{}'"
fun foo(list: List<String>): Int {
<caret>return if (list.any { it.length > 0 }) -1 else takeInt()
}

1
idea/testData/intentions/loopToCallChain/any_return.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any()'"
fun foo(list: List<String>): Boolean {
<caret>for (s in list) {
return true

1
idea/testData/intentions/loopToCallChain/any_return.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'any()'"
fun foo(list: List<String>): Boolean {
<caret>return list.any()
}

1
idea/testData/intentions/loopToCallChain/assignFilter.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(list: List<String>): List<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(list: List<String>): List<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(list: List<String>, p: Int): List<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(list: List<String>, p: Int): List<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>, p: Int): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>, p: Int): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired3.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.*
fun foo(list: List<String>): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_ArrayListRequired3.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
import java.util.*
fun foo(list: List<String>): ArrayList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_MutableListRequired.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.toMutableList()'"
import java.util.ArrayList
fun foo(list: List<String>): MutableList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_MutableListRequired.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.toMutableList()'"
import java.util.ArrayList
fun foo(list: List<String>): MutableList<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_breakAndContinue.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(): List<String> {

1
idea/testData/intentions/loopToCallChain/assignFilter_breakAndContinue.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}'"
import java.util.ArrayList
fun foo(): List<String> {

1
idea/testData/intentions/loopToCallChain/assignMap.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.map{}'"
import java.util.ArrayList
fun foo(list: List<String>): List<Int> {

1
idea/testData/intentions/loopToCallChain/assignMap.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.map{}'"
import java.util.ArrayList
fun foo(list: List<String>): List<Int> {

1
idea/testData/intentions/loopToCallChain/filterIsInstance.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterIsInstance<>().map{}.firstOrNull()'"
fun foo(list: List<Any>): Int? {
<caret>for (o in list) {
if (o is String) {

1
idea/testData/intentions/loopToCallChain/filterIsInstance.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterIsInstance<>().map{}.firstOrNull()'"
fun foo(list: List<Any>): Int? {
return list
.filterIsInstance<String>()

1
idea/testData/intentions/loopToCallChain/filterIsInstance_ifContinue.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterIsInstance<>().map{}.firstOrNull()'"
fun foo(list: List<Any>): Int? {
<caret>for (o in list) {
if (o !is String) continue

1
idea/testData/intentions/loopToCallChain/filterIsInstance_ifContinue.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterIsInstance<>().map{}.firstOrNull()'"
fun foo(list: List<Any>): Int? {
return list
.filterIsInstance<String>()

1
idea/testData/intentions/loopToCallChain/filterNotNull.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNotNull().map{}.firstOrNull()'"
fun foo(list: List<String?>): Int? {
<caret>for (s in list) {
if (s != null) {

1
idea/testData/intentions/loopToCallChain/filterNotNull.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNotNull().map{}.firstOrNull()'"
fun foo(list: List<String?>): Int? {
<caret>return list
.filterNotNull()

1
idea/testData/intentions/loopToCallChain/filterNotNull_ifContinue.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNotNull().map{}.firstOrNull()'"
fun foo(list: List<Any?>): Int? {
<caret>for (o in list) {
if (o == null) continue

1
idea/testData/intentions/loopToCallChain/filterNotNull_ifContinue.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNotNull().map{}.firstOrNull()'"
fun foo(list: List<Any?>): Int? {
<caret>return list
.filterNotNull()

1
idea/testData/intentions/loopToCallChain/filterNot_ifContinue.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNot{}.map{}.firstOrNull()'"
fun foo(list: List<String>): Int? {
<caret>for (s in list) {
if (s.isEmpty()) continue

1
idea/testData/intentions/loopToCallChain/filterNot_ifContinue.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterNot{}.map{}.firstOrNull()'"
fun foo(list: List<String>): Int? {
<caret>return list
.filterNot { it.isEmpty() }

1
idea/testData/intentions/loopToCallChain/filterTo.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
fun foo(list: List<String>, target: MutableList<String>) {
<caret>for (s in list) {
if (s.length > 0)

1
idea/testData/intentions/loopToCallChain/filterTo.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
fun foo(list: List<String>, target: MutableList<String>) {
list.filterTo(target) { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/filterTo2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
fun foo(list: List<String>) {
val target = createCollection()
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/filterTo2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filterTo(){}'"
fun foo(list: List<String>) {
val target = createCollection()
<caret>list.filterTo(target) { it.length > 0 }

1
idea/testData/intentions/loopToCallChain/filter_ifContinue.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) continue

1
idea/testData/intentions/loopToCallChain/filter_ifContinue.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull { !it.isEmpty() }
}

1
idea/testData/intentions/loopToCallChain/filter_ifContinue2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (!s.isEmpty()) continue

1
idea/testData/intentions/loopToCallChain/filter_ifContinue2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull { it.isEmpty() }
}

1
idea/testData/intentions/loopToCallChain/filter_ifContinueInBlock.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) {

1
idea/testData/intentions/loopToCallChain/filter_ifContinueInBlock.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull { !it.isEmpty() }
}

1
idea/testData/intentions/loopToCallChain/filter_mergeMultiple.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.map{}.firstOrNull()'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) continue

1
idea/testData/intentions/loopToCallChain/filter_mergeMultiple.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'filter{}.map{}.firstOrNull()'"
fun foo(list: List<String>): String? {
return list
.filter { !it.isEmpty() && it.length < 10 && it != "abc" && it != "def" }

1
idea/testData/intentions/loopToCallChain/firstOrNull_assignmentInitialization.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = ""

1
idea/testData/intentions/loopToCallChain/firstOrNull_assignmentInitialization.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = ""

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = null
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>val result: String? = list.firstOrNull { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign_cannotBeVal.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = null
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign_cannotBeVal.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>var result: String? = list.firstOrNull { it.length > 0 }

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign_preserveComments.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = null
<caret>for (s in list) { // search for first non-empty string in the list

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifAssign_preserveComments.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>val result: String? = list.firstOrNull { // search for first non-empty string in the list
it.length > 0

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifReturn.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.length > 0) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_ifReturn.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull { it.length > 0 }
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_let.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = null
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_let.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>val result: String? = list.firstOrNull { it.length > 0 }?.let { bar(it) }
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_let2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result: String? = null
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_let2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>val result: String? = list.firstOrNull { it.length > 0 }?.let { it.substring(0, it.length - 1) }
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
var result = ""
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_letOrNotNull.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>) {
<caret>val result = list.firstOrNull { it.length > 0 }?.let { bar(it) } ?: ""
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_return.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull()'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
return s

1
idea/testData/intentions/loopToCallChain/firstOrNull_return.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull()'"
fun foo(list: List<String>): String? {
<caret>return list.firstOrNull()
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnExpression.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): Int? {
<caret>for (s in list) {
if (s.isNotEmpty()) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnExpression.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): Int? {
<caret>return list.firstOrNull { it.isNotEmpty() }?.length
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): Int {
<caret>for (s in list) {
if (s.isNotEmpty()) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnExpressionOrNotNull.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): Int {
<caret>return list.firstOrNull { it.isNotEmpty() }?.length ?: -1
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String {
<caret>for (s in list) {
if (s.isNotEmpty()) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_returnNotNullIfNone.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String {
<caret>return list.firstOrNull { it.isNotEmpty() } ?: ""
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_return_comment.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull()'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
return s

1
idea/testData/intentions/loopToCallChain/firstOrNull_return_comment.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull()'"
fun foo(list: List<String>): String? {
// return null if not found
return list.firstOrNull()

1
idea/testData/intentions/loopToCallChain/firstOrNull_safeDotExpression.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String?>) {
var result: String? = null
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/firstOrNull_safeDotExpression.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String?>) {
<caret>val result: String? = list.firstOrNull { it != "" }?.substring(1)
}

1
idea/testData/intentions/loopToCallChain/firstOrNull_withMergedFilter.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
if (s.isEmpty()) continue

1
idea/testData/intentions/loopToCallChain/firstOrNull_withMergedFilter.kt.after vendored
View File

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

1
idea/testData/intentions/loopToCallChain/flatMap.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMap{}.firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>for (s in list) {
for (line in s.lines()) {

1
idea/testData/intentions/loopToCallChain/flatMap.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMap{}.firstOrNull{}'"
fun foo(list: List<String>): String? {
<caret>return list
.flatMap { it.lines() }

1
idea/testData/intentions/loopToCallChain/flatMapTo.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
fun foo(list: List<String>, target: MutableList<String>) {
<caret>for (s in list) {
for (line in s.lines()) {

1
idea/testData/intentions/loopToCallChain/flatMapTo.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
fun foo(list: List<String>, target: MutableList<String>) {
<caret>list.flatMapTo(target) { it.lines() }
}

1
idea/testData/intentions/loopToCallChain/flatMapTo2.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>): List<String> {

1
idea/testData/intentions/loopToCallChain/flatMapTo2.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
import java.util.ArrayList
fun foo(list: List<String>): List<String> {

1
idea/testData/intentions/loopToCallChain/flatMapTo3.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
fun foo(list: List<String>): List<String> {
val target = createCollection()
<caret>for (s in list) {

1
idea/testData/intentions/loopToCallChain/flatMapTo3.kt.after vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMapTo(){}'"
fun foo(list: List<String>): List<String> {
val target = createCollection()
<caret>list.flatMapTo(target) { it.lines() }

1
idea/testData/intentions/loopToCallChain/flatMapWithBreak.kt vendored
View File

@@ -1,4 +1,5 @@
// WITH_RUNTIME
// INTENTION_TEXT: "Replace with 'flatMap{}.firstOrNull{}'"
fun foo(list: List<String>): String? {
var result: String? = null
MainLoop@

Some files were not shown because too many files have changed in this diff Show More