Wrap options for constructor parameters

#KT-12176 In Progress

idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt

@@ -297,13 +297,17 @@ abstract class KotlinCommonBlock(
         val commonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE)
         val elementType = node.elementType
 
-        if (elementType === KtNodeTypes.VALUE_ARGUMENT_LIST) {
+        when {
-            return getWrappingStrategyForItemList(commonSettings.CALL_PARAMETERS_WRAP, KtNodeTypes.VALUE_ARGUMENT)
+            elementType === KtNodeTypes.VALUE_ARGUMENT_LIST ->
-        }
+                return getWrappingStrategyForItemList(commonSettings.CALL_PARAMETERS_WRAP, KtNodeTypes.VALUE_ARGUMENT)
-        if (elementType === KtNodeTypes.VALUE_PARAMETER_LIST) {
+
-            val parentElementType = node.treeParent.elementType
+            elementType === KtNodeTypes.VALUE_PARAMETER_LIST -> {
-            if (parentElementType === KtNodeTypes.FUN || parentElementType === KtNodeTypes.CLASS) {
+                val parentElementType = node.treeParent.elementType
-                return getWrappingStrategyForItemList(commonSettings.METHOD_PARAMETERS_WRAP, KtNodeTypes.VALUE_PARAMETER)
+                if (parentElementType === KtNodeTypes.FUN ||
+                    parentElementType === KtNodeTypes.PRIMARY_CONSTRUCTOR ||
+                    parentElementType === KtNodeTypes.SECONDARY_CONSTRUCTOR) {
+                    return getWrappingStrategyForItemList(commonSettings.METHOD_PARAMETERS_WRAP, KtNodeTypes.VALUE_PARAMETER)
+                }
             }
         }
 

idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt

@@ -33,4 +33,100 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+            longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+            longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass,
+        b: LongLongLongLongNameCLass,
+        c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass,
+                b: LongLongLongLongNameCLass,
+                c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName,
+        sn2: ShorName,
+        sn3: ShorName,
+        sn4: ShorName,
+        sn5: ShorName,
+        sn6: ShorName,
+        sn6: ShorName,
+        sn8: ShorName,
+        sn9: ShorName) {
+    constructor(sn1: ShorName,
+                sn2: ShorName,
+                sn3: ShorName,
+                sn4: ShorName,
+                sn5: ShorName,
+                sn6: ShorName,
+                sn6: ShorName,
+                sn8: ShorName,
+                sn9: ShorName) {
+    }
+}
+
+class D(sn1: SN,
+        sn2: SN,
+        sn3: SN,
+        sn4: SN,
+        sn5: SN,
+        sn6: SN,
+        sn6: SN,
+        sn8: SN,
+        sn9: SN,
+        sn10: SN,
+        sn11: SN,
+        sn12: SN,
+        sn13: SN,
+        sn14: SN) {
+    constructor(sn1: SN,
+                sn2: SN,
+                sn3: SN,
+                sn4: SN,
+                sn5: SN,
+                sn6: SN,
+                sn6: SN,
+                sn8: SN,
+                sn9: SN,
+                sn10: SN,
+                sn11: SN,
+                sn12: SN,
+                sn13: SN,
+                sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2: SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListChopAsNeeded.kt

@@ -30,4 +30,48 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    constructor(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    constructor(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2 : SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListDoNotWrap.after.kt

@@ -30,4 +30,48 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName, sn2: ShorName, sn3: ShorName, sn4: ShorName, sn5: ShorName, sn6: ShorName, sn6: ShorName, sn8: ShorName, sn9: ShorName) {
+    constructor(sn1: ShorName, sn2: ShorName, sn3: ShorName, sn4: ShorName, sn5: ShorName, sn6: ShorName, sn6: ShorName, sn8: ShorName, sn9: ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2: SN, sn3: SN, sn4: SN, sn5: SN, sn6: SN, sn6: SN, sn8: SN, sn9: SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    constructor(sn1: SN, sn2: SN, sn3: SN, sn4: SN, sn5: SN, sn6: SN, sn6: SN, sn8: SN, sn9: SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2: SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListDoNotWrap.kt

@@ -30,4 +30,48 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    constructor(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    constructor(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2 : SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt

@@ -34,4 +34,99 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+                longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+                longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass,
+        b: LongLongLongLongNameCLass,
+        c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass,
+                b: LongLongLongLongNameCLass,
+                c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName,
+        sn2: ShorName,
+        sn3: ShorName,
+        sn4: ShorName,
+        sn5: ShorName,
+        sn6: ShorName,
+        sn6: ShorName,
+        sn8: ShorName,
+        sn9: ShorName) {
+    constructor(sn1: ShorName,
+                sn2: ShorName,
+                sn3: ShorName,
+                sn4: ShorName,
+                sn5: ShorName,
+                sn6: ShorName,
+                sn6: ShorName,
+                sn8: ShorName,
+                sn9: ShorName) {
+    }
+}
+
+class D(sn1: SN,
+        sn2: SN,
+        sn3: SN,
+        sn4: SN,
+        sn5: SN,
+        sn6: SN,
+        sn6: SN,
+        sn8: SN,
+        sn9: SN,
+        sn10: SN,
+        sn11: SN,
+        sn12: SN,
+        sn13: SN,
+        sn14: SN) {
+    constructor(sn1: SN,
+                sn2: SN,
+                sn3: SN,
+                sn4: SN,
+                sn5: SN,
+                sn6: SN,
+                sn6: SN,
+                sn8: SN,
+                sn9: SN,
+                sn10: SN,
+                sn11: SN,
+                sn12: SN,
+                sn13: SN,
+                sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN,
+        sn2: SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListWrapAlways.kt

@@ -30,4 +30,48 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    constructor(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    constructor(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2 : SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt

@@ -35,4 +35,96 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+        longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass,
+            longLongLongLongNameCLass2: LongLongLongLongNameCLass,
+            longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass,
+        b: LongLongLongLongNameCLass,
+        c: LongLongLongLongNameCLass) {
+    constructor(
+            a: LongLongLongLongNameCLass,
+            b: LongLongLongLongNameCLass,
+            c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName,
+        sn2: ShorName,
+        sn3: ShorName,
+        sn4: ShorName,
+        sn5: ShorName,
+        sn6: ShorName,
+        sn6: ShorName,
+        sn8: ShorName,
+        sn9: ShorName) {
+    constructor(sn1: ShorName,
+                sn2: ShorName,
+                sn3: ShorName,
+                sn4: ShorName,
+                sn5: ShorName,
+                sn6: ShorName,
+                sn6: ShorName,
+                sn8: ShorName,
+                sn9: ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2: SN,
+        sn3: SN, sn4: SN,
+        sn5: SN, sn6: SN,
+        sn6: SN, sn8: SN,
+        sn9: SN, sn10: SN,
+        sn11: SN, sn12: SN,
+        sn13: SN, sn14: SN) {
+    constructor(sn1: SN,
+                sn2: SN,
+                sn3: SN,
+                sn4: SN,
+                sn5: SN,
+                sn6: SN,
+                sn6: SN,
+                sn8: SN,
+                sn9: SN,
+                sn10: SN,
+                sn11: SN,
+                sn12: SN,
+                sn13: SN,
+                sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(
+            longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(
+            a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(
+            sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2: SN) {
+    constructor(sn1: SN) {
+    }
+}

idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.kt

@@ -30,4 +30,48 @@ fun test() {
     } catch (barbarbarbarbar: Exception) {
 
     }
-}
+}
+
+class LongLongLongLongNameCLass
+class ShorName
+class SN
+
+class A(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass, longLongLongLongNameCLass2: LongLongLongLongNameCLass, longLongLongLongNameCLass3: LongLongLongLongNameCLass) {
+    }
+}
+
+class B(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass, b: LongLongLongLongNameCLass, c: LongLongLongLongNameCLass) {
+    }
+}
+
+class C(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    constructor(sn1: ShorName, sn2 : ShorName, sn3 : ShorName, sn4 : ShorName, sn5 : ShorName, sn6 : ShorName, sn6 : ShorName, sn8 : ShorName, sn9 : ShorName) {
+    }
+}
+
+class D(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    constructor(sn1: SN, sn2 : SN, sn3 : SN, sn4 : SN, sn5 : SN, sn6 : SN, sn6 : SN, sn8 : SN, sn9 : SN, sn10: SN, sn11: SN, sn12: SN, sn13: SN, sn14: SN) {
+    }
+}
+
+class E(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    constructor(longLongLongLongNameCLass1: LongLongLongLongNameCLass) {
+    }
+}
+
+class F(a: LongLongLongLongNameCLass) {
+    constructor(a: LongLongLongLongNameCLass) {
+    }
+}
+
+class G(sn1: ShorName) {
+    constructor(sn1: ShorName) {
+    }
+}
+
+class H(sn1: SN, sn2 : SN) {
+    constructor(sn1: SN) {
+    }
+}