diff --git a/idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/after.kt.template b/idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/after.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/after.kt.template
rename to idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/after.kt.template
diff --git a/idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/before.kt.template b/idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/before.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/before.kt.template
rename to idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/before.kt.template
diff --git a/idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/description.html b/idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/description.html
similarity index 100%
rename from idea/resources/intentionDescriptions/MakeTypeExplicitInLambdaIntention/description.html
rename to idea/resources/intentionDescriptions/SpecifyExplicitLambdaSignatureIntention/description.html
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 2814ef771b5..ad6ec126961 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -789,7 +789,7 @@
- org.jetbrains.kotlin.idea.intentions.MakeTypeExplicitInLambdaIntention
+ org.jetbrains.kotlin.idea.intentions.SpecifyExplicitLambdaSignatureIntention
Kotlin
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
similarity index 95%
rename from idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
index a715ec7e685..f26d54e70c0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.idea.caches.resolve.analyze
-public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention(javaClass(), "Make types explicit in lambda") {
+public class SpecifyExplicitLambdaSignatureIntention : JetSelfTargetingIntention(javaClass(), "Specify explicit lambda signature") {
override fun isApplicableTo(element: JetFunctionLiteralExpression, caretOffset: Int): Boolean {
val arrow = element.getFunctionLiteral().getArrowNode()
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/.intention b/idea/testData/intentions/makeTypeExplicitInLambda/.intention
deleted file mode 100644
index 3e4563108a8..00000000000
--- a/idea/testData/intentions/makeTypeExplicitInLambda/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.MakeTypeExplicitInLambdaIntention
diff --git a/idea/testData/intentions/specifyExplicitLambdaSignature/.intention b/idea/testData/intentions/specifyExplicitLambdaSignature/.intention
new file mode 100644
index 00000000000..e8d1c8a0b96
--- /dev/null
+++ b/idea/testData/intentions/specifyExplicitLambdaSignature/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.SpecifyExplicitLambdaSignatureIntention
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithBrackets.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithBrackets.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithBrackets.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithBrackets.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithoutItWithArrow.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithoutItWithArrow.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithoutItWithArrow.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithoutItWithArrow.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/invalidCursorPosition.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/invalidCursorPosition.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/invalidCursorPosition.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/invalidCursorPosition.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt.after
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt.after
rename to idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt.after
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/typesAlreadyExplicit.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/typesAlreadyExplicit.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/typesAlreadyExplicit.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/typesAlreadyExplicit.kt
diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/typesNotInferable.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/typesNotInferable.kt
similarity index 100%
rename from idea/testData/intentions/makeTypeExplicitInLambda/typesNotInferable.kt
rename to idea/testData/intentions/specifyExplicitLambdaSignature/typesNotInferable.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 40e58752c17..2de2f8caead 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -4349,93 +4349,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
}
- @TestMetadata("idea/testData/intentions/makeTypeExplicitInLambda")
- @TestDataPath("$PROJECT_ROOT")
- @RunWith(JUnit3RunnerWithInners.class)
- public static class MakeTypeExplicitInLambda extends AbstractIntentionTest {
- public void testAllFilesPresentInMakeTypeExplicitInLambda() throws Exception {
- JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeExplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true);
- }
-
- @TestMetadata("coercionToUnit.kt")
- public void testCoercionToUnit() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt");
- doTest(fileName);
- }
-
- @TestMetadata("emptyParamListWithBrackets.kt")
- public void testEmptyParamListWithBrackets() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithBrackets.kt");
- doTest(fileName);
- }
-
- @TestMetadata("emptyParamListWithIt.kt")
- public void testEmptyParamListWithIt() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt");
- doTest(fileName);
- }
-
- @TestMetadata("emptyParamListWithWhiteSpace.kt")
- public void testEmptyParamListWithWhiteSpace() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt");
- doTest(fileName);
- }
-
- @TestMetadata("emptyParamListWithoutItWithArrow.kt")
- public void testEmptyParamListWithoutItWithArrow() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithoutItWithArrow.kt");
- doTest(fileName);
- }
-
- @TestMetadata("invalidCursorPosition.kt")
- public void testInvalidCursorPosition() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/invalidCursorPosition.kt");
- doTest(fileName);
- }
-
- @TestMetadata("lambdaWithLambdaAsParam.kt")
- public void testLambdaWithLambdaAsParam() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt");
- doTest(fileName);
- }
-
- @TestMetadata("manyNewlines.kt")
- public void testManyNewlines() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt");
- doTest(fileName);
- }
-
- @TestMetadata("multipleParam.kt")
- public void testMultipleParam() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt");
- doTest(fileName);
- }
-
- @TestMetadata("shortenReferencesForParams.kt")
- public void testShortenReferencesForParams() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt");
- doTest(fileName);
- }
-
- @TestMetadata("singleParam.kt")
- public void testSingleParam() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt");
- doTest(fileName);
- }
-
- @TestMetadata("typesAlreadyExplicit.kt")
- public void testTypesAlreadyExplicit() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/typesAlreadyExplicit.kt");
- doTest(fileName);
- }
-
- @TestMetadata("typesNotInferable.kt")
- public void testTypesNotInferable() throws Exception {
- String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/typesNotInferable.kt");
- doTest(fileName);
- }
- }
-
@TestMetadata("idea/testData/intentions/makeTypeImplicitInLambda")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
@@ -5797,6 +5710,93 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
+ @TestMetadata("idea/testData/intentions/specifyExplicitLambdaSignature")
+ @TestDataPath("$PROJECT_ROOT")
+ @RunWith(JUnit3RunnerWithInners.class)
+ public static class SpecifyExplicitLambdaSignature extends AbstractIntentionTest {
+ public void testAllFilesPresentInSpecifyExplicitLambdaSignature() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyExplicitLambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true);
+ }
+
+ @TestMetadata("coercionToUnit.kt")
+ public void testCoercionToUnit() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("emptyParamListWithBrackets.kt")
+ public void testEmptyParamListWithBrackets() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithBrackets.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("emptyParamListWithIt.kt")
+ public void testEmptyParamListWithIt() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("emptyParamListWithWhiteSpace.kt")
+ public void testEmptyParamListWithWhiteSpace() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("emptyParamListWithoutItWithArrow.kt")
+ public void testEmptyParamListWithoutItWithArrow() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithoutItWithArrow.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("invalidCursorPosition.kt")
+ public void testInvalidCursorPosition() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/invalidCursorPosition.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("lambdaWithLambdaAsParam.kt")
+ public void testLambdaWithLambdaAsParam() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("manyNewlines.kt")
+ public void testManyNewlines() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("multipleParam.kt")
+ public void testMultipleParam() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("shortenReferencesForParams.kt")
+ public void testShortenReferencesForParams() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("singleParam.kt")
+ public void testSingleParam() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("typesAlreadyExplicit.kt")
+ public void testTypesAlreadyExplicit() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesAlreadyExplicit.kt");
+ doTest(fileName);
+ }
+
+ @TestMetadata("typesNotInferable.kt")
+ public void testTypesNotInferable() throws Exception {
+ String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesNotInferable.kt");
+ doTest(fileName);
+ }
+ }
+
@TestMetadata("idea/testData/intentions/specifyType")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)