diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index 8905759cde4..598e402b332 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -495,6 +495,14 @@ public class KtPsiUtil { return false; } + // 'x = fun {}' case + if (parentElement instanceof KtBinaryExpression && + parentOperation == KtTokens.EQ && + innerExpression instanceof KtNamedFunction && + currentInner == ((KtBinaryExpression) parentElement).getRight()) { + return false; + } + if (innerExpression instanceof KtBinaryExpression) { // '(x operator return [...]) operator ...' case if (parentElement instanceof KtBinaryExpression) { diff --git a/idea/testData/intentions/declarations/split/anonymousFunction.kt b/idea/testData/intentions/declarations/split/anonymousFunction.kt new file mode 100644 index 00000000000..c01a524f24e --- /dev/null +++ b/idea/testData/intentions/declarations/split/anonymousFunction.kt @@ -0,0 +1,4 @@ +fun test() { + val f = fun () { + } +} \ No newline at end of file diff --git a/idea/testData/intentions/declarations/split/anonymousFunction.kt.after b/idea/testData/intentions/declarations/split/anonymousFunction.kt.after new file mode 100644 index 00000000000..208cc6e71c4 --- /dev/null +++ b/idea/testData/intentions/declarations/split/anonymousFunction.kt.after @@ -0,0 +1,5 @@ +fun test() { + val f: () -> Unit + f = fun () { + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 8215b5724bd..1d754b6770d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -8577,6 +8577,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true); } + @TestMetadata("anonymousFunction.kt") + public void testAnonymousFunction() throws Exception { + runTest("idea/testData/intentions/declarations/split/anonymousFunction.kt"); + } + @TestMetadata("longInit.kt") public void testLongInit() throws Exception { runTest("idea/testData/intentions/declarations/split/longInit.kt");