From 65d59467a8946b4be42b8e807d3ac74138dace4b Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 28 Apr 2015 18:01:28 +0300 Subject: [PATCH] Renamed intention --- .../after.kt.template | 0 .../before.kt.template | 0 .../description.html | 0 idea/src/META-INF/plugin.xml | 2 +- ...eExplicitLambdaParameterTypesIntention.kt} | 2 +- .../makeTypeImplicitInLambda/.intention | 1 - .../.intention | 1 + .../invalidCursorPosition.kt | 0 .../lambdaWithLambdaAsParam.kt | 0 .../lambdaWithLambdaAsParam.kt.after | 0 .../multipleExplicitParams.kt | 0 .../multipleExplicitParams.kt.after | 0 .../paramTypeDeclared.kt | 0 .../paramTypeDeclared.kt.after | 0 .../singleExplicitParam.kt | 0 .../singleExplicitParam.kt.after | 0 .../typesAlreadyImplicit.kt | 0 .../intentions/IntentionTestGenerated.java | 90 +++++++++---------- 18 files changed, 48 insertions(+), 48 deletions(-) rename idea/resources/intentionDescriptions/{MakeTypeImplicitInLambdaIntention => RemoveExplicitLambdaParameterTypesIntention}/after.kt.template (100%) rename idea/resources/intentionDescriptions/{MakeTypeImplicitInLambdaIntention => RemoveExplicitLambdaParameterTypesIntention}/before.kt.template (100%) rename idea/resources/intentionDescriptions/{MakeTypeImplicitInLambdaIntention => RemoveExplicitLambdaParameterTypesIntention}/description.html (100%) rename idea/src/org/jetbrains/kotlin/idea/intentions/{MakeTypeImplicitInLambdaIntention.kt => RemoveExplicitLambdaParameterTypesIntention.kt} (89%) delete mode 100644 idea/testData/intentions/makeTypeImplicitInLambda/.intention create mode 100644 idea/testData/intentions/removeExplicitLambdaParameterTypes/.intention rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/invalidCursorPosition.kt (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/lambdaWithLambdaAsParam.kt (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/lambdaWithLambdaAsParam.kt.after (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/multipleExplicitParams.kt (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/multipleExplicitParams.kt.after (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/paramTypeDeclared.kt (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/paramTypeDeclared.kt.after (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/singleExplicitParam.kt (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/singleExplicitParam.kt.after (100%) rename idea/testData/intentions/{makeTypeImplicitInLambda => removeExplicitLambdaParameterTypes}/typesAlreadyImplicit.kt (100%) diff --git a/idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/after.kt.template b/idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/after.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/after.kt.template rename to idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/after.kt.template diff --git a/idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/before.kt.template b/idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/before.kt.template similarity index 100% rename from idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/before.kt.template rename to idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/before.kt.template diff --git a/idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/description.html b/idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/description.html similarity index 100% rename from idea/resources/intentionDescriptions/MakeTypeImplicitInLambdaIntention/description.html rename to idea/resources/intentionDescriptions/RemoveExplicitLambdaParameterTypesIntention/description.html diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 9041d5f7bd3..564652f7729 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -794,7 +794,7 @@ - org.jetbrains.kotlin.idea.intentions.MakeTypeImplicitInLambdaIntention + org.jetbrains.kotlin.idea.intentions.RemoveExplicitLambdaParameterTypesIntention Kotlin diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt similarity index 89% rename from idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt index 1645eef68a3..dbe98343738 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.lexer.JetTokens -public class MakeTypeImplicitInLambdaIntention : JetSelfTargetingIntention(javaClass(), "Make types implicit in lambda (may break code)") { +public class RemoveExplicitLambdaParameterTypesIntention : JetSelfTargetingIntention(javaClass(), "Remove explicit lambda parameter types (may break code)") { override fun isApplicableTo(element: JetFunctionLiteralExpression, caretOffset: Int): Boolean { if (element.getValueParameters().none { it.getTypeReference() != null }) return false val arrow = element.getFunctionLiteral().getArrowNode() ?: return false diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/.intention b/idea/testData/intentions/makeTypeImplicitInLambda/.intention deleted file mode 100644 index a23c6dc11fd..00000000000 --- a/idea/testData/intentions/makeTypeImplicitInLambda/.intention +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.intentions.MakeTypeImplicitInLambdaIntention diff --git a/idea/testData/intentions/removeExplicitLambdaParameterTypes/.intention b/idea/testData/intentions/removeExplicitLambdaParameterTypes/.intention new file mode 100644 index 00000000000..f338d11ee6e --- /dev/null +++ b/idea/testData/intentions/removeExplicitLambdaParameterTypes/.intention @@ -0,0 +1 @@ +org.jetbrains.kotlin.idea.intentions.RemoveExplicitLambdaParameterTypesIntention diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/invalidCursorPosition.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/invalidCursorPosition.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/invalidCursorPosition.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/invalidCursorPosition.kt diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt.after b/idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt.after similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt.after rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt.after diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt.after b/idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt.after similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt.after rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt.after diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/paramTypeDeclared.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/paramTypeDeclared.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/paramTypeDeclared.kt.after b/idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt.after similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/paramTypeDeclared.kt.after rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt.after diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt.after b/idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt.after similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt.after rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt.after diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/typesAlreadyImplicit.kt b/idea/testData/intentions/removeExplicitLambdaParameterTypes/typesAlreadyImplicit.kt similarity index 100% rename from idea/testData/intentions/makeTypeImplicitInLambda/typesAlreadyImplicit.kt rename to idea/testData/intentions/removeExplicitLambdaParameterTypes/typesAlreadyImplicit.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 13b4c7247ca..2b12c8e2fa9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -4349,51 +4349,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/makeTypeImplicitInLambda") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class MakeTypeImplicitInLambda extends AbstractIntentionTest { - public void testAllFilesPresentInMakeTypeImplicitInLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeImplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("invalidCursorPosition.kt") - public void testInvalidCursorPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/invalidCursorPosition.kt"); - doTest(fileName); - } - - @TestMetadata("lambdaWithLambdaAsParam.kt") - public void testLambdaWithLambdaAsParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt"); - doTest(fileName); - } - - @TestMetadata("multipleExplicitParams.kt") - public void testMultipleExplicitParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt"); - doTest(fileName); - } - - @TestMetadata("paramTypeDeclared.kt") - public void testParamTypeDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/paramTypeDeclared.kt"); - doTest(fileName); - } - - @TestMetadata("singleExplicitParam.kt") - public void testSingleExplicitParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt"); - doTest(fileName); - } - - @TestMetadata("typesAlreadyImplicit.kt") - public void testTypesAlreadyImplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/typesAlreadyImplicit.kt"); - doTest(fileName); - } - } - @TestMetadata("idea/testData/intentions/moveLambdaInsideParentheses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -4910,6 +4865,51 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } + @TestMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class RemoveExplicitLambdaParameterTypes extends AbstractIntentionTest { + public void testAllFilesPresentInRemoveExplicitLambdaParameterTypes() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitLambdaParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("invalidCursorPosition.kt") + public void testInvalidCursorPosition() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/invalidCursorPosition.kt"); + doTest(fileName); + } + + @TestMetadata("lambdaWithLambdaAsParam.kt") + public void testLambdaWithLambdaAsParam() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt"); + doTest(fileName); + } + + @TestMetadata("multipleExplicitParams.kt") + public void testMultipleExplicitParams() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt"); + doTest(fileName); + } + + @TestMetadata("paramTypeDeclared.kt") + public void testParamTypeDeclared() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt"); + doTest(fileName); + } + + @TestMetadata("singleExplicitParam.kt") + public void testSingleExplicitParam() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt"); + doTest(fileName); + } + + @TestMetadata("typesAlreadyImplicit.kt") + public void testTypesAlreadyImplicit() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/typesAlreadyImplicit.kt"); + doTest(fileName); + } + } + @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)