From 1b7ac6bb02b0bef4690c44b732cb731d275e875e Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 29 Apr 2015 17:29:03 +0300 Subject: [PATCH] Renamed intention to more clear name --- .../kotlin/idea/JetBundle.properties | 2 - .../after.kt.template | 0 .../before.kt.template | 0 .../description.html | 0 idea/src/META-INF/plugin.xml | 2 +- ...ion.kt => InfixCallToOrdinaryIntention.kt} | 2 +- .../intentions/infixCallToOrdinary/.intention | 1 + .../functionCallAfterInfixCall.kt | 0 .../functionCallAfterInfixCall.kt.after | 0 .../functionLiteralArgument.kt | 0 .../functionLiteralArgument.kt.after | 0 .../nonApplicableBinaryOperation.kt | 0 .../nullAssertedCall.kt | 0 .../nullAssertedCall.kt.after | 0 .../parenthesesAroundRightHandArgument.kt | 0 ...arenthesesAroundRightHandArgument.kt.after | 0 .../simpleInfixFunctionCall.kt | 0 .../simpleInfixFunctionCall.kt.after | 0 .../.intention | 1 - .../intentions/IntentionTestGenerated.java | 90 +++++++++---------- 20 files changed, 48 insertions(+), 50 deletions(-) rename idea/resources/intentionDescriptions/{ReplaceWithDotQualifiedMethodCallIntention => InfixCallToOrdinaryIntention}/after.kt.template (100%) rename idea/resources/intentionDescriptions/{ReplaceWithDotQualifiedMethodCallIntention => InfixCallToOrdinaryIntention}/before.kt.template (100%) rename idea/resources/intentionDescriptions/{ReplaceWithDotQualifiedMethodCallIntention => InfixCallToOrdinaryIntention}/description.html (100%) rename idea/src/org/jetbrains/kotlin/idea/intentions/{ReplaceWithDotQualifiedMethodCallIntention.kt => InfixCallToOrdinaryIntention.kt} (91%) create mode 100644 idea/testData/intentions/infixCallToOrdinary/.intention rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/functionCallAfterInfixCall.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/functionCallAfterInfixCall.kt.after (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/functionLiteralArgument.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/functionLiteralArgument.kt.after (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/nonApplicableBinaryOperation.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/nullAssertedCall.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/nullAssertedCall.kt.after (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/parenthesesAroundRightHandArgument.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/parenthesesAroundRightHandArgument.kt.after (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/simpleInfixFunctionCall.kt (100%) rename idea/testData/intentions/{replaceWithDotQualifiedMethodCall => infixCallToOrdinary}/simpleInfixFunctionCall.kt.after (100%) delete mode 100644 idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 6c8a8c4d3c1..47f26d9cbbb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties @@ -290,8 +290,6 @@ add.name.to.argument.single=Add name to argument\: ''{0}'' add.name.to.argument.multiple=Add name to argument... add.name.to.argument.action=Add name to argument... add.name.to.parameter.name.chooser.title=Choose parameter name -replace.with.dot.qualified.method.call.intention=Replace with simple method call -replace.with.dot.qualified.method.call.intention.family=Replace with Simple Method Call replace.with.infix.function.call.intention=Replace with infix function call replace.with.infix.function.call.intention.family=Replace with Infix Function Call replace.with.infix.function.call.intention.error.resolution.failed=The element cannot be resolved diff --git a/idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/after.kt.template b/idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/after.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/after.kt.template rename to idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/after.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/before.kt.template b/idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/before.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/before.kt.template rename to idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/before.kt.template diff --git a/idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/description.html b/idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/description.html similarity index 100% rename from idea/resources/intentionDescriptions/ReplaceWithDotQualifiedMethodCallIntention/description.html rename to idea/resources/intentionDescriptions/InfixCallToOrdinaryIntention/description.html diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index ef4a420d259..e7b985cc5c7 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -719,7 +719,7 @@ - org.jetbrains.kotlin.idea.intentions.ReplaceWithDotQualifiedMethodCallIntention + org.jetbrains.kotlin.idea.intentions.InfixCallToOrdinaryIntention Kotlin diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt index 665ed2a6e9f..f614838db33 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.lexer.JetTokens -public class ReplaceWithDotQualifiedMethodCallIntention : JetSelfTargetingOffsetIndependentIntention("replace.with.dot.qualified.method.call.intention", javaClass()) { +public class InfixCallToOrdinaryIntention : JetSelfTargetingOffsetIndependentIntention(javaClass(), "Replace infix call with ordinary call") { override fun isApplicableTo(element: JetBinaryExpression): Boolean { return element.getLeft() != null && element.getRight() != null && element.getOperationToken() == JetTokens.IDENTIFIER } diff --git a/idea/testData/intentions/infixCallToOrdinary/.intention b/idea/testData/intentions/infixCallToOrdinary/.intention new file mode 100644 index 00000000000..db03b3260af --- /dev/null +++ b/idea/testData/intentions/infixCallToOrdinary/.intention @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.intentions.InfixCallToOrdinaryIntention diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt b/idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt rename to idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt.after b/idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt.after similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt.after rename to idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt.after diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt b/idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt rename to idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt.after b/idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt.after similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt.after rename to idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt.after diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/nonApplicableBinaryOperation.kt b/idea/testData/intentions/infixCallToOrdinary/nonApplicableBinaryOperation.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/nonApplicableBinaryOperation.kt rename to idea/testData/intentions/infixCallToOrdinary/nonApplicableBinaryOperation.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt b/idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt rename to idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt.after b/idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt.after similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt.after rename to idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt.after diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt b/idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt rename to idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt.after b/idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt.after similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt.after rename to idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt.after diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt b/idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt rename to idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt.after b/idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt.after similarity index 100% rename from idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt.after rename to idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt.after diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention b/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention deleted file mode 100644 index cca5972c52a..00000000000 --- a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.intentions.ReplaceWithDotQualifiedMethodCallIntention diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index b90f5c9d253..fa14e733316 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -4181,6 +4181,51 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } + @TestMetadata("idea/testData/intentions/infixCallToOrdinary") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InfixCallToOrdinary extends AbstractIntentionTest { + public void testAllFilesPresentInInfixCallToOrdinary() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/infixCallToOrdinary"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("functionCallAfterInfixCall.kt") + public void testFunctionCallAfterInfixCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt"); + doTest(fileName); + } + + @TestMetadata("functionLiteralArgument.kt") + public void testFunctionLiteralArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt"); + doTest(fileName); + } + + @TestMetadata("nonApplicableBinaryOperation.kt") + public void testNonApplicableBinaryOperation() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nonApplicableBinaryOperation.kt"); + doTest(fileName); + } + + @TestMetadata("nullAssertedCall.kt") + public void testNullAssertedCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt"); + doTest(fileName); + } + + @TestMetadata("parenthesesAroundRightHandArgument.kt") + public void testParenthesesAroundRightHandArgument() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt"); + doTest(fileName); + } + + @TestMetadata("simpleInfixFunctionCall.kt") + public void testSimpleInfixFunctionCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/testData/intentions/insertCurlyBracesToTemplate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -5310,51 +5355,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ReplaceWithDotQualifiedMethodCall extends AbstractIntentionTest { - public void testAllFilesPresentInReplaceWithDotQualifiedMethodCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithDotQualifiedMethodCall"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("functionCallAfterInfixCall.kt") - public void testFunctionCallAfterInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt"); - doTest(fileName); - } - - @TestMetadata("functionLiteralArgument.kt") - public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt"); - doTest(fileName); - } - - @TestMetadata("nonApplicableBinaryOperation.kt") - public void testNonApplicableBinaryOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nonApplicableBinaryOperation.kt"); - doTest(fileName); - } - - @TestMetadata("nullAssertedCall.kt") - public void testNullAssertedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt"); - doTest(fileName); - } - - @TestMetadata("parenthesesAroundRightHandArgument.kt") - public void testParenthesesAroundRightHandArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt"); - doTest(fileName); - } - - @TestMetadata("simpleInfixFunctionCall.kt") - public void testSimpleInfixFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt"); - doTest(fileName); - } - } - @TestMetadata("idea/testData/intentions/replaceWithInfixFunctionCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)