diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java index b254adf099b..aa740e1bbb0 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java @@ -113,6 +113,8 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder { .beforeInside(LBRACE, WHEN).spacing(1, 1, 0, true, 0) //omit blank lines before '{' in 'when' statement .aroundInside(ARROW, FUNCTION_TYPE).spaceIf(jetSettings.SPACE_AROUND_FUNCTION_TYPE_ARROW) + + .betweenInside(REFERENCE_EXPRESSION, FUNCTION_LITERAL_EXPRESSION, CALL_EXPRESSION).spaces(1) ; } diff --git a/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt b/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt new file mode 100644 index 00000000000..226ba86f1e4 --- /dev/null +++ b/idea/testData/formatter/ReferenceExpressionFunctionLiteral.kt @@ -0,0 +1,3 @@ +fun f() { + array(1, 2, 3).map{ v -> v } +} \ No newline at end of file diff --git a/idea/testData/formatter/ReferenceExpressionFunctionLiteral_after.kt b/idea/testData/formatter/ReferenceExpressionFunctionLiteral_after.kt new file mode 100644 index 00000000000..6cc8094939c --- /dev/null +++ b/idea/testData/formatter/ReferenceExpressionFunctionLiteral_after.kt @@ -0,0 +1,3 @@ +fun f() { + array(1, 2, 3).map { v -> v } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java index 860bf045c76..2cee0d234eb 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java @@ -147,6 +147,10 @@ public class JetFormatterTest extends AbstractJetFormatterTest { doTestWithInvert(); } + public void testReferenceExpressionFunctionLiteral() throws Exception { + doTest(); + } + @Override public void doTest() throws Exception { String originalFileText = AbstractJetFormatterTest.loadFile(getTestName(false) + ".kt");