diff --git a/idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/after.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/after.kt.template rename to idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/after.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/before.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/before.kt.template rename to idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/before.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/description.html b/idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/description.html similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceBinaryInfixIntention/description.html rename to idea/resources/intentionDescriptions/ReplaceCallWithBinaryOperatorIntention/description.html diff --git a/idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/after.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/after.kt.template rename to idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/after.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/before.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/before.kt.template rename to idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/before.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/description.html b/idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/description.html similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceUnaryPrefixIntention/description.html rename to idea/resources/intentionDescriptions/ReplaceCallWithUnaryOperatorIntention/description.html diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 0c092f23647..5d0d41bf39c 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -551,12 +551,12 @@ - org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceUnaryPrefixIntention + org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithUnaryOperatorIntention Kotlin - org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceBinaryInfixIntention + org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithBinaryOperatorIntention Kotlin diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceBinaryInfixIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt similarity index 93% rename from idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceBinaryInfixIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt index 4c97bc4e600..8e3536d392b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceBinaryInfixIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.createExpressionByPattern import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch -public class ReplaceBinaryInfixIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace call with binary operator") { +public class ReplaceCallWithBinaryOperatorIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace call with binary operator") { override fun isApplicableTo(element: JetDotQualifiedExpression): Boolean { val operation = operation(element.functionName) ?: return false val resolvedCall = element.toResolvedCall() ?: return false diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceUnaryPrefixIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt similarity index 92% rename from idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceUnaryPrefixIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt index e7b914a0b2b..002c3d8e5c4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceUnaryPrefixIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.createExpressionByPattern -public class ReplaceUnaryPrefixIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace call with unary operator") { +public class ReplaceCallWithUnaryOperatorIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace call with unary operator") { override fun isApplicableTo(element: JetDotQualifiedExpression): Boolean { val operation = operation(element.functionName) ?: return false val call = element.callExpression ?: return false diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/.intention b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/.intention similarity index 66% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/.intention rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/.intention index 994d3134d7c..cf3891326f9 100644 --- a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/.intention +++ b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/.intention @@ -1 +1 @@ -org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceUnaryPrefixIntention +org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithBinaryOperatorIntention diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg1.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg1.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg1.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg1.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg2.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg2.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg2.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg2.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/allowableDefaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/allowableDefaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/allowableDefaultArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/allowableDefaultArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/divSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/divSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/divSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/divSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/extensionFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/extensionFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/extensionFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/extensionFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/functionLiteralArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/functionLiteralArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/functionLiteralArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/functionLiteralArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/minusSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/minusSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/minusSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/minusSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/missingDefaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/missingDefaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/missingDefaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/missingDefaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/modSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/modSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/modSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/modSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/multipleArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/multipleArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/multipleArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/multipleArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/plusSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/plusSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/plusSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/plusSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/rangeToSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/rangeToSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/rangeToSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/rangeToSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/timesSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/timesSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/timesSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/timesSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/typeArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/typeArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg1.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg1.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg1.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg1.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg2.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg2.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg2.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg2.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/validNamedArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/validNamedArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/validNamedArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/validNamedArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/.intention b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/.intention similarity index 67% rename from idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/.intention rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/.intention index 16bd9dc4655..4d11a5e53c8 100644 --- a/idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/.intention +++ b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/.intention @@ -1 +1 @@ -org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceBinaryInfixIntention +org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithUnaryOperatorIntention diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/acceptableVararg.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/acceptableVararg.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/acceptableVararg.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/acceptableVararg.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/complexPlus.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/complexPlus.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/complexPlus.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/complexPlus.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/defaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/defaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/defaultArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/defaultArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/extensionFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/extensionFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/extensionFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/extensionFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/functionLiteralArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/functionLiteralArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/functionLiteralArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/functionLiteralArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/minusSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/minusSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/minusSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/minusSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/namedValueArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/namedValueArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/namedValueArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/namedValueArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/notSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/notSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/notSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/notSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusPlus.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusPlus.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusPlus.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusPlus.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusSanityTest.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusSanityTest.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusSanityTest.kt.after b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusSanityTest.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/typeArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/typeArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/typeArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/typeArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/unacceptableVararg.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/unacceptableVararg.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/unacceptableVararg.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/unacceptableVararg.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/valueArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/valueArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/valueArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/valueArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/.intention b/idea/testData/intentions/conventionNameCalls/replaceContains/.intention similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/.intention rename to idea/testData/intentions/conventionNameCalls/replaceContains/.intention diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg2.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg2.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg2.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg2.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/allowableDefaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/allowableDefaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/allowableDefaultArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/allowableDefaultArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/containsInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/containsInExpression.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/containsInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/containsInExpression.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/extensionFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/extensionFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/extensionFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/extensionFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentInExpression.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentInExpression.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/invalidArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/invalidArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingDefaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/missingDefaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingDefaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/missingDefaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/multipleArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/multipleArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/multipleArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/multipleArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/simpleArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/simpleArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/simpleArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/simpleArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/typeArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/typeArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/typeArguments.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/typeArguments.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg1.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg1.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg1.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg1.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg2.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg2.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg2.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg2.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/validNamedArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/validNamedArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceContainsIntention/validNamedArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceContainsIntention/validNamedArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/.intention b/idea/testData/intentions/conventionNameCalls/replaceGet/.intention similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/.intention rename to idea/testData/intentions/conventionNameCalls/replaceGet/.intention diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/acceptableVararg.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/acceptableVararg.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/acceptableVararg.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/acceptableVararg.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/acceptableVararg.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/acceptableVararg.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/acceptableVararg.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/acceptableVararg.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/argumentAndFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/argumentAndFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/argumentAndFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/argumentAndFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/argumentAndFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/argumentAndFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/argumentAndFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/argumentAndFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/duplicateArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/duplicateArguments.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/duplicateArguments.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/duplicateArguments.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/extensionFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/extensionFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/extensionFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/extensionFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/extensionFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/extensionFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/extensionFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/extensionFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/functionalArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/functionalArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/functionalArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/functionalArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/functionalArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/functionalArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/functionalArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/functionalArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/inspectionData/expected.xml b/idea/testData/intentions/conventionNameCalls/replaceGet/inspectionData/expected.xml similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/inspectionData/expected.xml rename to idea/testData/intentions/conventionNameCalls/replaceGet/inspectionData/expected.xml diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/inspectionData/inspections.test b/idea/testData/intentions/conventionNameCalls/replaceGet/inspectionData/inspections.test similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/inspectionData/inspections.test rename to idea/testData/intentions/conventionNameCalls/replaceGet/inspectionData/inspections.test diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/invalidArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/invalidArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/invalidArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/invalidArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/missingDefaultArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/missingDefaultArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/missingDefaultArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/missingDefaultArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/multiArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/multiArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/multiArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/multiArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/multiArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/multiArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/multiArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/multiArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/noArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/noArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/noArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/noArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/sanityCheck.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/sanityCheck.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/sanityCheck.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/sanityCheck.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/singleArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/singleArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/singleArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/singleArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/singleArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceGet/singleArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/singleArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceGet/singleArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/unacceptableVararg.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/unacceptableVararg.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/unacceptableVararg.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/unacceptableVararg.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceGetIntention/unnamedAndNamed.kt b/idea/testData/intentions/conventionNameCalls/replaceGet/unnamedAndNamed.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceGetIntention/unnamedAndNamed.kt rename to idea/testData/intentions/conventionNameCalls/replaceGet/unnamedAndNamed.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/.intention b/idea/testData/intentions/conventionNameCalls/replaceInvoke/.intention similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/.intention rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/.intention diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/expressionReceiver.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/expressionReceiver.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/expressionReceiver.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/expressionReceiver.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/extensionFunction.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/extensionFunction.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/extensionFunction.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/extensionFunction.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/functionLiteralInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/functionLiteralInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/functionLiteralInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/functionLiteralInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/invokeInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/invokeInExpression.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/invokeInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/invokeInExpression.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/namedArgumentInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/namedArgumentInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/namedArgumentInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/namedArgumentInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/noArgumentInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/noArgumentInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/noArgumentInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/noArgumentInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeAndValueArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeAndValueArgument.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeAndValueArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeAndValueArgument.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueArgumentInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueArgumentInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueArgumentInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueArgumentInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt.after diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/varargInvoke.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/varargInvoke.kt rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/varargInvoke.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt.after similarity index 100% rename from idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/varargInvoke.kt.after rename to idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt.after diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java index e37131ad899..16328ec8168 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java @@ -49,9 +49,9 @@ public class JetInspectionTestGenerated extends AbstractJetInspectionTest { doTest(fileName); } - @TestMetadata("conventionNameCalls/replaceGetIntention/inspectionData/inspections.test") - public void testConventionNameCalls_replaceGetIntention_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/inspectionData/inspections.test"); + @TestMetadata("conventionNameCalls/replaceGet/inspectionData/inspections.test") + public void testConventionNameCalls_replaceGet_inspectionData_Inspections_test() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/inspectionData/inspections.test"); doTest(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 233f09872bd..06e53ce6143 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -1938,480 +1938,480 @@ public class IntentionTestGenerated extends AbstractIntentionTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention") + @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceBinaryInfixIntention extends AbstractIntentionTest { + public static class ReplaceCallWithBinaryOperator extends AbstractIntentionTest { @TestMetadata("acceptableVararg1.kt") public void testAcceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg1.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt"); doTest(fileName); } @TestMetadata("acceptableVararg2.kt") public void testAcceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/acceptableVararg2.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt"); doTest(fileName); } - public void testAllFilesPresentInReplaceBinaryInfixIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention"), Pattern.compile("^(.+)\\.kt$"), true); + public void testAllFilesPresentInReplaceCallWithBinaryOperator() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("allowableDefaultArgument.kt") public void testAllowableDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/allowableDefaultArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt"); doTest(fileName); } @TestMetadata("divSanityTest.kt") public void testDivSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/divSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/extensionFunction.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/functionLiteralArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("minusSanityTest.kt") public void testMinusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/minusSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt"); doTest(fileName); } @TestMetadata("missingDefaultArgument.kt") public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/missingDefaultArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/missingDefaultArgument.kt"); doTest(fileName); } @TestMetadata("modSanityTest.kt") public void testModSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/modSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt"); doTest(fileName); } @TestMetadata("multipleArguments.kt") public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/multipleArguments.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/multipleArguments.kt"); doTest(fileName); } @TestMetadata("plusSanityTest.kt") public void testPlusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/plusSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt"); doTest(fileName); } @TestMetadata("rangeToSanityTest.kt") public void testRangeToSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/rangeToSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt"); doTest(fileName); } @TestMetadata("timesSanityTest.kt") public void testTimesSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/timesSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt"); doTest(fileName); } @TestMetadata("typeArguments.kt") public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/typeArguments.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg1.kt") public void testUnacceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg1.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg1.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg2.kt") public void testUnacceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/unacceptableVararg2.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg2.kt"); doTest(fileName); } @TestMetadata("validNamedArgument.kt") public void testValidNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceBinaryInfixIntention/validNamedArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt"); doTest(fileName); } } - @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention") + @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceContainsIntention extends AbstractIntentionTest { + public static class ReplaceCallWithUnaryOperator extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt"); doTest(fileName); } - @TestMetadata("acceptableVararg2.kt") - public void testAcceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/acceptableVararg2.kt"); - doTest(fileName); - } - - public void testAllFilesPresentInReplaceContainsIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceContainsIntention"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("allowableDefaultArgument.kt") - public void testAllowableDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/allowableDefaultArgument.kt"); - doTest(fileName); - } - - @TestMetadata("containsInExpression.kt") - public void testContainsInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/containsInExpression.kt"); - doTest(fileName); - } - - @TestMetadata("extensionFunction.kt") - public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/extensionFunction.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralArgument.kt") - public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgument.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralArgumentAfterSemicolon.kt") - public void testFunctionLiteralArgumentAfterSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralArgumentAtStartOfBlock.kt") - public void testFunctionLiteralArgumentAtStartOfBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralArgumentInExpression.kt") - public void testFunctionLiteralArgumentInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/functionLiteralArgumentInExpression.kt"); - doTest(fileName); - } - - @TestMetadata("invalidArgument.kt") - public void testInvalidArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/invalidArgument.kt"); - doTest(fileName); - } - - @TestMetadata("missingArgument.kt") - public void testMissingArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingArgument.kt"); - doTest(fileName); - } - - @TestMetadata("missingDefaultArgument.kt") - public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/missingDefaultArgument.kt"); - doTest(fileName); - } - - @TestMetadata("multipleArguments.kt") - public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/multipleArguments.kt"); - doTest(fileName); - } - - @TestMetadata("simpleArgument.kt") - public void testSimpleArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/simpleArgument.kt"); - doTest(fileName); - } - - @TestMetadata("typeArguments.kt") - public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/typeArguments.kt"); - doTest(fileName); - } - - @TestMetadata("unacceptableVararg1.kt") - public void testUnacceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg1.kt"); - doTest(fileName); - } - - @TestMetadata("unacceptableVararg2.kt") - public void testUnacceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/unacceptableVararg2.kt"); - doTest(fileName); - } - - @TestMetadata("validNamedArgument.kt") - public void testValidNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContainsIntention/validNamedArgument.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceGetIntention extends AbstractIntentionTest { - @TestMetadata("acceptableVararg.kt") - public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/acceptableVararg.kt"); - doTest(fileName); - } - - public void testAllFilesPresentInReplaceGetIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceGetIntention"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("argumentAndFunction.kt") - public void testArgumentAndFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/argumentAndFunction.kt"); - doTest(fileName); - } - - @TestMetadata("duplicateArguments.kt") - public void testDuplicateArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/duplicateArguments.kt"); - doTest(fileName); - } - - @TestMetadata("extensionFunction.kt") - public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/extensionFunction.kt"); - doTest(fileName); - } - - @TestMetadata("functionalArgument.kt") - public void testFunctionalArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/functionalArgument.kt"); - doTest(fileName); - } - - @TestMetadata("invalidArgument.kt") - public void testInvalidArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/invalidArgument.kt"); - doTest(fileName); - } - - @TestMetadata("missingDefaultArgument.kt") - public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/missingDefaultArgument.kt"); - doTest(fileName); - } - - @TestMetadata("multiArgument.kt") - public void testMultiArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/multiArgument.kt"); - doTest(fileName); - } - - @TestMetadata("noArgument.kt") - public void testNoArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/noArgument.kt"); - doTest(fileName); - } - - @TestMetadata("sanityCheck.kt") - public void testSanityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/sanityCheck.kt"); - doTest(fileName); - } - - @TestMetadata("singleArgument.kt") - public void testSingleArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/singleArgument.kt"); - doTest(fileName); - } - - @TestMetadata("unacceptableVararg.kt") - public void testUnacceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/unacceptableVararg.kt"); - doTest(fileName); - } - - @TestMetadata("unnamedAndNamed.kt") - public void testUnnamedAndNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetIntention/unnamedAndNamed.kt"); - doTest(fileName); - } - - } - - @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceInvokeIntention extends AbstractIntentionTest { - public void testAllFilesPresentInReplaceInvokeIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("expressionReceiver.kt") - public void testExpressionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/expressionReceiver.kt"); - doTest(fileName); - } - - @TestMetadata("extensionFunction.kt") - public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/extensionFunction.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralInvoke.kt") - public void testFunctionLiteralInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/functionLiteralInvoke.kt"); - doTest(fileName); - } - - @TestMetadata("invokeInExpression.kt") - public void testInvokeInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/invokeInExpression.kt"); - doTest(fileName); - } - - @TestMetadata("namedArgumentInvoke.kt") - public void testNamedArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/namedArgumentInvoke.kt"); - doTest(fileName); - } - - @TestMetadata("noArgumentInvoke.kt") - public void testNoArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/noArgumentInvoke.kt"); - doTest(fileName); - } - - @TestMetadata("typeAndValueArgument.kt") - public void testTypeAndValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeAndValueArgument.kt"); - doTest(fileName); - } - - @TestMetadata("typeArgumentAndFunctionLiteral.kt") - public void testTypeArgumentAndFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt"); - doTest(fileName); - } - - @TestMetadata("valueAndFunctionLiteralInvoke.kt") - public void testValueAndFunctionLiteralInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt"); - doTest(fileName); - } - - @TestMetadata("valueArgumentInvoke.kt") - public void testValueArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/valueArgumentInvoke.kt"); - doTest(fileName); - } - - @TestMetadata("varargInvoke.kt") - public void testVarargInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvokeIntention/varargInvoke.kt"); - doTest(fileName); - } - } - - @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceUnaryPrefixIntention extends AbstractIntentionTest { - @TestMetadata("acceptableVararg.kt") - public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/acceptableVararg.kt"); - doTest(fileName); - } - - public void testAllFilesPresentInReplaceUnaryPrefixIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention"), Pattern.compile("^(.+)\\.kt$"), true); + public void testAllFilesPresentInReplaceCallWithUnaryOperator() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("complexPlus.kt") public void testComplexPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/complexPlus.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt"); doTest(fileName); } @TestMetadata("defaultArgument.kt") public void testDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/defaultArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/extensionFunction.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/functionLiteralArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("minusSanityTest.kt") public void testMinusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/minusSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt"); doTest(fileName); } @TestMetadata("namedValueArgument.kt") public void testNamedValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/namedValueArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/namedValueArgument.kt"); doTest(fileName); } @TestMetadata("notSanityTest.kt") public void testNotSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/notSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt"); doTest(fileName); } @TestMetadata("plusPlus.kt") public void testPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusPlus.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt"); doTest(fileName); } @TestMetadata("plusSanityTest.kt") public void testPlusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/plusSanityTest.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt"); doTest(fileName); } @TestMetadata("typeArguments.kt") public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/typeArguments.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/typeArguments.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg.kt") public void testUnacceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/unacceptableVararg.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/unacceptableVararg.kt"); doTest(fileName); } @TestMetadata("valueArgument.kt") public void testValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceUnaryPrefixIntention/valueArgument.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/valueArgument.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceContains") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ReplaceContains extends AbstractIntentionTest { + @TestMetadata("acceptableVararg.kt") + public void testAcceptableVararg() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt"); + doTest(fileName); + } + + @TestMetadata("acceptableVararg2.kt") + public void testAcceptableVararg2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInReplaceContains() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceContains"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("allowableDefaultArgument.kt") + public void testAllowableDefaultArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("containsInExpression.kt") + public void testContainsInExpression() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt"); + doTest(fileName); + } + + @TestMetadata("extensionFunction.kt") + public void testExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralArgument.kt") + public void testFunctionLiteralArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralArgumentAfterSemicolon.kt") + public void testFunctionLiteralArgumentAfterSemicolon() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralArgumentAtStartOfBlock.kt") + public void testFunctionLiteralArgumentAtStartOfBlock() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralArgumentInExpression.kt") + public void testFunctionLiteralArgumentInExpression() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt"); + doTest(fileName); + } + + @TestMetadata("invalidArgument.kt") + public void testInvalidArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt"); + doTest(fileName); + } + + @TestMetadata("missingArgument.kt") + public void testMissingArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt"); + doTest(fileName); + } + + @TestMetadata("missingDefaultArgument.kt") + public void testMissingDefaultArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("multipleArguments.kt") + public void testMultipleArguments() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/multipleArguments.kt"); + doTest(fileName); + } + + @TestMetadata("simpleArgument.kt") + public void testSimpleArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt"); + doTest(fileName); + } + + @TestMetadata("typeArguments.kt") + public void testTypeArguments() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt"); + doTest(fileName); + } + + @TestMetadata("unacceptableVararg1.kt") + public void testUnacceptableVararg1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg1.kt"); + doTest(fileName); + } + + @TestMetadata("unacceptableVararg2.kt") + public void testUnacceptableVararg2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg2.kt"); + doTest(fileName); + } + + @TestMetadata("validNamedArgument.kt") + public void testValidNamedArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt"); + doTest(fileName); + } + } + + @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceGet") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ReplaceGet extends AbstractIntentionTest { + @TestMetadata("acceptableVararg.kt") + public void testAcceptableVararg() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/acceptableVararg.kt"); + doTest(fileName); + } + + public void testAllFilesPresentInReplaceGet() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceGet"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("argumentAndFunction.kt") + public void testArgumentAndFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/argumentAndFunction.kt"); + doTest(fileName); + } + + @TestMetadata("duplicateArguments.kt") + public void testDuplicateArguments() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/duplicateArguments.kt"); + doTest(fileName); + } + + @TestMetadata("extensionFunction.kt") + public void testExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/extensionFunction.kt"); + doTest(fileName); + } + + @TestMetadata("functionalArgument.kt") + public void testFunctionalArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/functionalArgument.kt"); + doTest(fileName); + } + + @TestMetadata("invalidArgument.kt") + public void testInvalidArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/invalidArgument.kt"); + doTest(fileName); + } + + @TestMetadata("missingDefaultArgument.kt") + public void testMissingDefaultArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/missingDefaultArgument.kt"); + doTest(fileName); + } + + @TestMetadata("multiArgument.kt") + public void testMultiArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/multiArgument.kt"); + doTest(fileName); + } + + @TestMetadata("noArgument.kt") + public void testNoArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/noArgument.kt"); + doTest(fileName); + } + + @TestMetadata("sanityCheck.kt") + public void testSanityCheck() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/sanityCheck.kt"); + doTest(fileName); + } + + @TestMetadata("singleArgument.kt") + public void testSingleArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/singleArgument.kt"); + doTest(fileName); + } + + @TestMetadata("unacceptableVararg.kt") + public void testUnacceptableVararg() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/unacceptableVararg.kt"); + doTest(fileName); + } + + @TestMetadata("unnamedAndNamed.kt") + public void testUnnamedAndNamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGet/unnamedAndNamed.kt"); + doTest(fileName); + } + + } + + @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ReplaceInvoke extends AbstractIntentionTest { + public void testAllFilesPresentInReplaceInvoke() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceInvoke"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("expressionReceiver.kt") + public void testExpressionReceiver() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt"); + doTest(fileName); + } + + @TestMetadata("extensionFunction.kt") + public void testExtensionFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralInvoke.kt") + public void testFunctionLiteralInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt"); + doTest(fileName); + } + + @TestMetadata("invokeInExpression.kt") + public void testInvokeInExpression() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt"); + doTest(fileName); + } + + @TestMetadata("namedArgumentInvoke.kt") + public void testNamedArgumentInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt"); + doTest(fileName); + } + + @TestMetadata("noArgumentInvoke.kt") + public void testNoArgumentInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt"); + doTest(fileName); + } + + @TestMetadata("typeAndValueArgument.kt") + public void testTypeAndValueArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt"); + doTest(fileName); + } + + @TestMetadata("typeArgumentAndFunctionLiteral.kt") + public void testTypeArgumentAndFunctionLiteral() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt"); + doTest(fileName); + } + + @TestMetadata("valueAndFunctionLiteralInvoke.kt") + public void testValueAndFunctionLiteralInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt"); + doTest(fileName); + } + + @TestMetadata("valueArgumentInvoke.kt") + public void testValueArgumentInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt"); + doTest(fileName); + } + + @TestMetadata("varargInvoke.kt") + public void testVarargInvoke() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt"); doTest(fileName); } }