From 5bb195df9b766c71fbc0fa213be33140bb926c72 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Sun, 4 Feb 2018 11:08:42 +0100 Subject: [PATCH] No space between label and lambda in labeled expressions #KT-22301 Fixed --- .../org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt | 1 + idea/testData/formatter/LabeledExpression.after.kt | 2 +- .../moveLambdaInsideParentheses/moveLabeledLambda2.kt.after | 2 +- idea/testData/quickfix/createLabel/returnInLambda.kt.after | 2 +- idea/testData/quickfix/createLabel/returnInOuterLambda.kt.after | 2 +- .../quickfix/migration/obsoleteLabelSyntax/lambda.kt.after | 2 +- .../refactoring/rename/labeledLambdaByLabel/after/test.kt | 2 +- .../refactoring/rename/labeledLambdaByLabelRef/after/test.kt | 2 +- .../rename/labeledLambdaByLabelWithParens/after/test.kt | 2 +- .../rename/labeledLambdaByLabelWithSameName/after/test.kt | 2 +- .../rename/labeledLambdaWithMultipleLabels/after/test.kt | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) 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 1544994ccbc..7e148700a16 100644 --- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt +++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt @@ -259,6 +259,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing afterInside(LABEL_QUALIFIER, RETURN).spaces(1) betweenInside(LABEL_QUALIFIER, EOL_COMMENT, LABELED_EXPRESSION).spacing(0, Int.MAX_VALUE, 0, true, kotlinCommonSettings.KEEP_BLANK_LINES_IN_CODE) betweenInside(LABEL_QUALIFIER, BLOCK_COMMENT, LABELED_EXPRESSION).spacing(0, Int.MAX_VALUE, 0, true, kotlinCommonSettings.KEEP_BLANK_LINES_IN_CODE) + betweenInside(LABEL_QUALIFIER, LAMBDA_EXPRESSION, LABELED_EXPRESSION).spaces(0) afterInside(LABEL_QUALIFIER, LABELED_EXPRESSION).spaces(1) betweenInside(FUN_KEYWORD, VALUE_PARAMETER_LIST, FUN).spacing(0, 0, 0, false, 0) diff --git a/idea/testData/formatter/LabeledExpression.after.kt b/idea/testData/formatter/LabeledExpression.after.kt index ab99b80594b..4bf1c967130 100644 --- a/idea/testData/formatter/LabeledExpression.after.kt +++ b/idea/testData/formatter/LabeledExpression.after.kt @@ -5,7 +5,7 @@ fun test1() { } fun test2() { - listOf(1).forEach lit@ { + listOf(1).forEach lit@{ if (it == 0) return@lit print(it) } diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt.after index ac1a4ddf663..8232a82eba6 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/testData/quickfix/createLabel/returnInLambda.kt.after b/idea/testData/quickfix/createLabel/returnInLambda.kt.after index 4ad7ad9d3c3..f2ba2c5cde4 100644 --- a/idea/testData/quickfix/createLabel/returnInLambda.kt.after +++ b/idea/testData/quickfix/createLabel/returnInLambda.kt.after @@ -3,5 +3,5 @@ inline fun Int.bar(f: (Int) -> Unit) { } fun test() { - 1.bar foo@ { if (it == 2) return@foo } + 1.bar foo@{ if (it == 2) return@foo } } \ No newline at end of file diff --git a/idea/testData/quickfix/createLabel/returnInOuterLambda.kt.after b/idea/testData/quickfix/createLabel/returnInOuterLambda.kt.after index 65930fba552..85995c6c910 100644 --- a/idea/testData/quickfix/createLabel/returnInOuterLambda.kt.after +++ b/idea/testData/quickfix/createLabel/returnInOuterLambda.kt.after @@ -3,5 +3,5 @@ inline fun Int.bar(f: (Int) -> Unit) { } fun test() { - 1.bar foo@ { 2.bar { if (it == 2) return@foo } } + 1.bar foo@{ 2.bar { if (it == 2) return@foo } } } \ No newline at end of file diff --git a/idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt.after b/idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt.after index d1bc777164e..3a075a9bce7 100644 --- a/idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt.after +++ b/idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt.after @@ -3,7 +3,7 @@ fun run(block: () -> Unit) = block() fun foo() { - run label@ { + run label@{ return@label } } diff --git a/idea/testData/refactoring/rename/labeledLambdaByLabel/after/test.kt b/idea/testData/refactoring/rename/labeledLambdaByLabel/after/test.kt index 08f14de44f2..0d44e981dd4 100644 --- a/idea/testData/refactoring/rename/labeledLambdaByLabel/after/test.kt +++ b/idea/testData/refactoring/rename/labeledLambdaByLabel/after/test.kt @@ -1,5 +1,5 @@ fun foo(f: () -> R) = f() fun test() { - foo baz@ { return@baz false } + foo baz@{ return@baz false } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/labeledLambdaByLabelRef/after/test.kt b/idea/testData/refactoring/rename/labeledLambdaByLabelRef/after/test.kt index 08f14de44f2..0d44e981dd4 100644 --- a/idea/testData/refactoring/rename/labeledLambdaByLabelRef/after/test.kt +++ b/idea/testData/refactoring/rename/labeledLambdaByLabelRef/after/test.kt @@ -1,5 +1,5 @@ fun foo(f: () -> R) = f() fun test() { - foo baz@ { return@baz false } + foo baz@{ return@baz false } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/labeledLambdaByLabelWithParens/after/test.kt b/idea/testData/refactoring/rename/labeledLambdaByLabelWithParens/after/test.kt index 501f176699f..47b159fdbd1 100644 --- a/idea/testData/refactoring/rename/labeledLambdaByLabelWithParens/after/test.kt +++ b/idea/testData/refactoring/rename/labeledLambdaByLabelWithParens/after/test.kt @@ -1,5 +1,5 @@ fun foo(f: () -> R) = f() fun test() { - foo (baz@ { return@baz false }) + foo (baz@{ return@baz false }) } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/labeledLambdaByLabelWithSameName/after/test.kt b/idea/testData/refactoring/rename/labeledLambdaByLabelWithSameName/after/test.kt index 08f14de44f2..0d44e981dd4 100644 --- a/idea/testData/refactoring/rename/labeledLambdaByLabelWithSameName/after/test.kt +++ b/idea/testData/refactoring/rename/labeledLambdaByLabelWithSameName/after/test.kt @@ -1,5 +1,5 @@ fun foo(f: () -> R) = f() fun test() { - foo baz@ { return@baz false } + foo baz@{ return@baz false } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/labeledLambdaWithMultipleLabels/after/test.kt b/idea/testData/refactoring/rename/labeledLambdaWithMultipleLabels/after/test.kt index be53b922b83..a3d99e2bb3b 100644 --- a/idea/testData/refactoring/rename/labeledLambdaWithMultipleLabels/after/test.kt +++ b/idea/testData/refactoring/rename/labeledLambdaWithMultipleLabels/after/test.kt @@ -1,5 +1,5 @@ fun foo(f: () -> R) = f() fun test() { - foo (bar2@ baz@ { return@baz false }) + foo (bar2@ baz@{ return@baz false }) } \ No newline at end of file