From 3cc3ad2b9ea008eab11c8d95d0b4a5586c604df0 Mon Sep 17 00:00:00 2001
From: Dmitry Neverov <dmitry.neverov@gmail.com>
Date: Mon, 17 Oct 2016 22:49:06 +0300
Subject: [PATCH] Fix spaces in labeled expression (KT-14131)

https://github.com/JetBrains/kotlin/pull/978

(cherry picked from commit fdd5ba7)
---
 .../idea/formatter/kotlinSpacingRules.kt      |  3 ++
 .../formatter/LabeledExpression.after.kt      | 40 +++++++++++++++++++
 idea/testData/formatter/LabeledExpression.kt  | 40 +++++++++++++++++++
 .../moveLabeledLambda2.kt.after               |  2 +-
 .../formatter/FormatterTestGenerated.java     |  6 +++
 5 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/formatter/LabeledExpression.after.kt
 create mode 100644 idea/testData/formatter/LabeledExpression.kt

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 4f19a7a7936..e0708322e5d 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -156,6 +156,9 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             betweenInside(RETURN_KEYWORD, LABEL_QUALIFIER, RETURN).spaces(0)
             afterInside(RETURN_KEYWORD, RETURN).spaces(1)
             afterInside(LABEL_QUALIFIER, RETURN).spaces(1)
+            betweenInside(LABEL_QUALIFIER, EOL_COMMENT, LABELED_EXPRESSION).spacing(0, Int.MAX_VALUE, 0, true, codeStyleSettings.KEEP_BLANK_LINES_IN_CODE)
+            betweenInside(LABEL_QUALIFIER, BLOCK_COMMENT, LABELED_EXPRESSION).spacing(0, Int.MAX_VALUE, 0, true, codeStyleSettings.KEEP_BLANK_LINES_IN_CODE)
+            afterInside(LABEL_QUALIFIER, LABELED_EXPRESSION).spaces(1)
 
             betweenInside(FUN_KEYWORD, VALUE_PARAMETER_LIST, FUN).spacing(0, 0, 0, false, 0)
             after(FUN_KEYWORD).spaces(1)
diff --git a/idea/testData/formatter/LabeledExpression.after.kt b/idea/testData/formatter/LabeledExpression.after.kt
new file mode 100644
index 00000000000..ab99b80594b
--- /dev/null
+++ b/idea/testData/formatter/LabeledExpression.after.kt
@@ -0,0 +1,40 @@
+fun test1() {
+    loop@ while (true) {
+
+    }
+}
+
+fun test2() {
+    listOf(1).forEach lit@ {
+        if (it == 0) return@lit
+        print(it)
+    }
+}
+
+fun test3() {
+    l1@
+
+
+    /*comment*/ {
+
+    }
+
+    l2@    /*comment*/ {
+
+    }
+}
+
+fun test4() {
+    l1@
+
+
+    //eol comment
+    {
+
+    }
+
+    l2@    //eol comment
+    {
+
+    }
+}
diff --git a/idea/testData/formatter/LabeledExpression.kt b/idea/testData/formatter/LabeledExpression.kt
new file mode 100644
index 00000000000..bf9b0f7c2aa
--- /dev/null
+++ b/idea/testData/formatter/LabeledExpression.kt
@@ -0,0 +1,40 @@
+fun test1() {
+    loop@    while(true) {
+
+    }
+}
+
+fun test2() {
+    listOf(1).forEach lit@    {
+        if (it == 0) return@lit
+        print(it)
+    }
+}
+
+fun test3() {
+    l1@
+
+
+    /*comment*/ {
+
+    }
+
+    l2@    /*comment*/ {
+
+    }
+}
+
+fun test4() {
+    l1@
+
+
+    //eol comment
+    {
+
+    }
+
+    l2@    //eol comment
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after
index 8232a82eba6..ac1a4ddf663 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: true
 fun foo() {
-    bar(l@{ it * 3 })
+    bar(l@ { it * 3 })
 }
 
 fun bar(b: (Int) -> Int) {
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index 8309983c98f..1ec9ae4154b 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -511,6 +511,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("LabeledExpression.after.kt")
+        public void testLabeledExpression() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/LabeledExpression.after.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("RightBracketOnNewLine.after.kt")
         public void testRightBracketOnNewLine() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.kt");