diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt index dcef32dbb38..799e00c5136 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt @@ -29,8 +29,10 @@ public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention("x") { it } +} + +fun bar(t:T, a: Int->Int) : Int { + return a(1) +} \ No newline at end of file diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after new file mode 100644 index 00000000000..3a9fa51b4cc --- /dev/null +++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after @@ -0,0 +1,8 @@ +// IS_APPLICABLE: true +fun foo() { + bar("x", { it }) +} + +fun bar(t:T, a: Int->Int) : Int { + return a(1) +} \ No newline at end of file diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt new file mode 100644 index 00000000000..39e574246c0 --- /dev/null +++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt @@ -0,0 +1,8 @@ +// IS_APPLICABLE: true +fun foo() { + bar { it } +} + +fun bar(a: (Int)->T): T { + return a(1) +} \ No newline at end of file diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after new file mode 100644 index 00000000000..737c2dd379e --- /dev/null +++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after @@ -0,0 +1,8 @@ +// IS_APPLICABLE: true +fun foo() { + bar({ it }) +} + +fun bar(a: (Int)->T): T { + return a(1) +} \ No newline at end of file diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt new file mode 100644 index 00000000000..308533a5e93 --- /dev/null +++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt @@ -0,0 +1,8 @@ +// IS_APPLICABLE: true +fun foo() { + bar("x", 1, 2) { it } +} + +fun bar(t: T, v: V, k: K, a: (Int)->Int): Int { + return a(1) +} \ No newline at end of file diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after new file mode 100644 index 00000000000..33af82989f5 --- /dev/null +++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after @@ -0,0 +1,8 @@ +// IS_APPLICABLE: true +fun foo() { + bar("x", 1, 2, { it }) +} + +fun bar(t: T, v: V, k: K, a: (Int)->Int): Int { + return a(1) +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java index a9eec7c6b5e..9337414d11f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java @@ -1890,6 +1890,21 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT doTestMoveLambdaInsideParentheses("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt"); } + @TestMetadata("moveLambda10.kt") + public void testMoveLambda10() throws Exception { + doTestMoveLambdaInsideParentheses("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt"); + } + + @TestMetadata("moveLambda11.kt") + public void testMoveLambda11() throws Exception { + doTestMoveLambdaInsideParentheses("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt"); + } + + @TestMetadata("moveLambda12.kt") + public void testMoveLambda12() throws Exception { + doTestMoveLambdaInsideParentheses("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt"); + } + @TestMetadata("moveLambda2.kt") public void testMoveLambda2() throws Exception { doTestMoveLambdaInsideParentheses("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda2.kt");