From 3d588acd2d842c989ab6de2f9289ccc3727fa8e5 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 12 May 2014 14:13:07 +0400 Subject: [PATCH] Add space between 'when' and '(' --- .../plugin/formatter/kotlinSpacingRules.kt | 1 + .../surroundWith/when/enum.kt.after | 2 +- .../when/multiExpression.kt.after | 2 +- .../when/singleExpression.kt.after | 2 +- idea/testData/formatter/When.after.inv.kt | 25 +++++++++++++ idea/testData/formatter/When.after.kt | 25 +++++++++++++ idea/testData/formatter/When.kt | 36 +++++++++++++++++++ .../formatter/WhenLineBreak.after.inv.kt | 8 ++--- .../testData/formatter/WhenLineBreak.after.kt | 8 ++--- idea/testData/formatter/WhenLineBreak.kt | 8 ++--- .../whenToAssignment/innerWhenTransformed.kt | 2 +- .../innerWhenTransformed.kt.after | 2 +- .../folding/whenToAssignment/simpleWhen.kt | 2 +- .../whenToAssignment/simpleWhen.kt.after | 2 +- .../whenToReturn/simpleWhenWithBlocks.kt | 2 +- .../simpleWhenWithBlocks.kt.after | 2 +- .../unfolding/propertyToWhen/simpleWhen.kt | 2 +- .../propertyToWhen/simpleWhen.kt.after | 2 +- .../unfolding/propertyToWhen/simpleWhen2.kt | 2 +- .../propertyToWhen/simpleWhen2.kt.after | 2 +- .../propertyToWhen/simpleWhenWithType.kt | 2 +- .../simpleWhenWithType.kt.after | 2 +- ...JetTypingIndentationTestBaseGenerated.java | 4 +-- 23 files changed, 115 insertions(+), 30 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt index b3359c18b7f..5d803a67fad 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt +++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt @@ -113,6 +113,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder { betweenInside(IF_KEYWORD, LPAR, IF).spacing(1, 1, 0, false, 0) betweenInside(WHILE_KEYWORD, LPAR, WHILE).spacing(1, 1, 0, false, 0) betweenInside(WHILE_KEYWORD, LPAR, DO_WHILE).spacing(1, 1, 0, false, 0) + betweenInside(WHEN_KEYWORD, LPAR, WHEN).spacing(1, 1, 0, false, 0) val TYPE_COLON_ELEMENTS = TokenSet.create(PROPERTY, FUN, VALUE_PARAMETER, MULTI_VARIABLE_DECLARATION_ENTRY, FUNCTION_LITERAL) beforeInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON) } diff --git a/idea/testData/codeInsight/surroundWith/when/enum.kt.after b/idea/testData/codeInsight/surroundWith/when/enum.kt.after index 35cf8400787..4fad65c0726 100644 --- a/idea/testData/codeInsight/surroundWith/when/enum.kt.after +++ b/idea/testData/codeInsight/surroundWith/when/enum.kt.after @@ -5,7 +5,7 @@ enum class MyEnum { fun foo() { val a = MyEnum.FIRST - when(a) { + when (a) { -> { } } diff --git a/idea/testData/codeInsight/surroundWith/when/multiExpression.kt.after b/idea/testData/codeInsight/surroundWith/when/multiExpression.kt.after index 93d6e61e115..cc30f7c02d4 100644 --- a/idea/testData/codeInsight/surroundWith/when/multiExpression.kt.after +++ b/idea/testData/codeInsight/surroundWith/when/multiExpression.kt.after @@ -1,6 +1,6 @@ fun foo() { val a = "aa" - when(a.capitalize()) { + when (a.capitalize()) { -> { } else -> { diff --git a/idea/testData/codeInsight/surroundWith/when/singleExpression.kt.after b/idea/testData/codeInsight/surroundWith/when/singleExpression.kt.after index 0985fea17c6..934829d0b6e 100644 --- a/idea/testData/codeInsight/surroundWith/when/singleExpression.kt.after +++ b/idea/testData/codeInsight/surroundWith/when/singleExpression.kt.after @@ -1,6 +1,6 @@ fun foo() { val a = "aa" - when(a) { + when (a) { -> { } else -> { diff --git a/idea/testData/formatter/When.after.inv.kt b/idea/testData/formatter/When.after.inv.kt index 5e38174d9c1..0a105c79269 100644 --- a/idea/testData/formatter/When.after.inv.kt +++ b/idea/testData/formatter/When.after.inv.kt @@ -3,6 +3,31 @@ fun some(x: Any) { is Number -> 0 else -> 1 } + when { + } + + when { + } + + + when { + } + + when (true) { + + } + + when (true) { + + } + + when (true) { + + } + + when (true) { + + } } // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH \ No newline at end of file diff --git a/idea/testData/formatter/When.after.kt b/idea/testData/formatter/When.after.kt index f6974d4077c..a2237d8f753 100644 --- a/idea/testData/formatter/When.after.kt +++ b/idea/testData/formatter/When.after.kt @@ -3,6 +3,31 @@ fun some(x: Any) { is Number -> 0 else -> 1 } + when { + } + + when { + } + + + when { + } + + when (true) { + + } + + when (true) { + + } + + when (true) { + + } + + when (true) { + + } } // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH \ No newline at end of file diff --git a/idea/testData/formatter/When.kt b/idea/testData/formatter/When.kt index bc499c2eb0e..616c0f13a06 100644 --- a/idea/testData/formatter/When.kt +++ b/idea/testData/formatter/When.kt @@ -3,6 +3,42 @@ when (x) { is Number -> 0 else->1 } + when { + } + + when{ + } + + + when + { + } + + when (true) { + + } + + when(true){ + + } + + when + (true) + { + + } + + when + + + + (true) + + + + { + + } } // SET_FALSE: ALIGN_IN_COLUMNS_CASE_BRANCH \ No newline at end of file diff --git a/idea/testData/formatter/WhenLineBreak.after.inv.kt b/idea/testData/formatter/WhenLineBreak.after.inv.kt index 5b2f584704e..1a41f7a98ac 100644 --- a/idea/testData/formatter/WhenLineBreak.after.inv.kt +++ b/idea/testData/formatter/WhenLineBreak.after.inv.kt @@ -1,5 +1,5 @@ fun f() { - when(c) { + when (c) { a -> { } b -> j @@ -7,7 +7,7 @@ fun f() { } } - when(c) { + when (c) { a -> { } b -> j @@ -15,7 +15,7 @@ fun f() { } } - when(c) { + when (c) { a -> { } b -> j @@ -23,7 +23,7 @@ fun f() { } } - when(c) //eol comment + when (c) //eol comment { a -> //eol comment { diff --git a/idea/testData/formatter/WhenLineBreak.after.kt b/idea/testData/formatter/WhenLineBreak.after.kt index f466b541adf..4cde661cccb 100644 --- a/idea/testData/formatter/WhenLineBreak.after.kt +++ b/idea/testData/formatter/WhenLineBreak.after.kt @@ -1,6 +1,6 @@ fun f() { - when(c) + when (c) { a -> { @@ -11,7 +11,7 @@ fun f() } } - when(c) + when (c) { a -> { @@ -22,7 +22,7 @@ fun f() } } - when(c) + when (c) { a -> { @@ -33,7 +33,7 @@ fun f() } } - when(c) //eol comment + when (c) //eol comment { a -> //eol comment { diff --git a/idea/testData/formatter/WhenLineBreak.kt b/idea/testData/formatter/WhenLineBreak.kt index d1b87bb95ac..287cadac049 100644 --- a/idea/testData/formatter/WhenLineBreak.kt +++ b/idea/testData/formatter/WhenLineBreak.kt @@ -1,6 +1,6 @@ fun f() { - when(c) { + when (c) { a -> { } b -> j @@ -8,7 +8,7 @@ fun f() } } - when(c) + when (c) { a -> { @@ -19,7 +19,7 @@ fun f() } } - when(c) + when (c) { a -> @@ -33,7 +33,7 @@ fun f() } } - when(c) //eol comment + when (c) //eol comment { a -> //eol comment { diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt index 7fd5d6b64b4..df895de9567 100644 --- a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt +++ b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt @@ -4,7 +4,7 @@ fun test(n: Int): String { var res: String if (3 > 2) { - when(n) { + when (n) { 1 -> { doSomething("***") res = "one" diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after index c86fecce736..91fcdde37d2 100644 --- a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after +++ b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after @@ -4,7 +4,7 @@ fun test(n: Int): String { var res: String if (3 > 2) { - res = when(n) { + res = when (n) { 1 -> { doSomething("***") "one" diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt index bf7f1257945..2a8e10ac318 100644 --- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt +++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt @@ -1,7 +1,7 @@ fun test(n: Int): String { var res: String - when(n) { + when (n) { 1 -> res = "one" else -> res = "two" } diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after index c961e534ccc..010032b7330 100644 --- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after +++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after @@ -1,7 +1,7 @@ fun test(n: Int): String { var res: String - res = when(n) { + res = when (n) { 1 -> "one" else -> "two" } diff --git a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt index 165b4b7a9d8..19af196ec03 100644 --- a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt +++ b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt @@ -1,7 +1,7 @@ fun doSomething(a: T) {} fun test(n: Int): String { - when(n) { + when (n) { 1 -> { doSomething("***") return "one" diff --git a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after index 4e6e7924f08..76d6c909722 100644 --- a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after +++ b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after @@ -1,7 +1,7 @@ fun doSomething(a: T) {} fun test(n: Int): String { - return when(n) { + return when (n) { 1 -> { doSomething("***") "one" diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt index 16796a9ac4a..ee6b2d4076b 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt @@ -1,5 +1,5 @@ fun test(n: Int): String? { - val res = when(n) { + val res = when (n) { 1 -> "one" 2 -> "two" else -> null diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after index c7e7082f1ca..74f1402f814 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt.after @@ -1,6 +1,6 @@ fun test(n: Int): String? { val res: String? - when(n) { + when (n) { 1 -> res = "one" 2 -> res = "two" else -> res = null diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt index c4595f97b71..54d34cea025 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt @@ -1,5 +1,5 @@ fun test(n: Int): String? { - var res = when(n) { + var res = when (n) { 1 -> "one" 2 -> "two" else -> null diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after index b4971e0feae..88ebf8db3ee 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt.after @@ -1,6 +1,6 @@ fun test(n: Int): String? { var res: String? - when(n) { + when (n) { 1 -> res = "one" 2 -> res = "two" else -> res = null diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt index 3d9f9d6b730..d11dae61879 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt @@ -1,5 +1,5 @@ fun test(n: Int): String? { - val res: String? = when(n) { + val res: String? = when (n) { 1 -> "one" 2 -> "two" else -> null diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after index c7e7082f1ca..74f1402f814 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after @@ -1,6 +1,6 @@ fun test(n: Int): String? { val res: String? - when(n) { + when (n) { 1 -> res = "one" 2 -> res = "two" else -> res = null diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java index 05f7c835370..e9eabf64d37 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java @@ -61,9 +61,7 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde } public void testAllFilesPresentInDirectSettings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", - new File("idea/testData/indentationOnNewline"), - Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/indentationOnNewline"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); } @TestMetadata("ConsecutiveCallsAfterDot.after.kt")