From 7587e8ffcb486a49b55ced92a99e0fbee119b8ec Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 13 Nov 2013 19:06:29 +0400 Subject: [PATCH] Insert space between ) and statement body --- .../plugin/formatter/JetFormattingModelBuilder.java | 2 ++ idea/testData/formatter/ForSpacing.after.kt | 10 ++++++++++ idea/testData/formatter/ForSpacing.kt | 12 +++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java index 4d57c43fe6d..dd90a933881 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java @@ -123,6 +123,8 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder { .aroundInside(ELSE_KEYWORD, IF).spaces(1) .betweenInside(RPAR, THEN, IF).spaces(1) + + .between(RPAR, BODY).spaces(1) ; } diff --git a/idea/testData/formatter/ForSpacing.after.kt b/idea/testData/formatter/ForSpacing.after.kt index 92c11211806..8db93e69250 100644 --- a/idea/testData/formatter/ForSpacing.after.kt +++ b/idea/testData/formatter/ForSpacing.after.kt @@ -5,4 +5,14 @@ fun f() { } for (i in array(1, 2)) { } + + for (i in array(1, 2)) { + } + + for (i in array(1, 2)) continue + + for (i in array(1, 2)) + + { + } } \ No newline at end of file diff --git a/idea/testData/formatter/ForSpacing.kt b/idea/testData/formatter/ForSpacing.kt index 556d77bf338..223830e03b6 100644 --- a/idea/testData/formatter/ForSpacing.kt +++ b/idea/testData/formatter/ForSpacing.kt @@ -1,9 +1,19 @@ fun f() { - for(i in array(1, 2)) { + for(i in array(1, 2)) { } for (i in array(1, 2)) { } for (i in array(1, 2)) { } + + for + (i in array(1, 2)){} + + for(i in array(1, 2))continue + + for (i in array(1, 2)) + + { + } } \ No newline at end of file