From c3c5805a5f9eb1d7bbbc53f2bacf4a62af9666f3 Mon Sep 17 00:00:00 2001
From: Dmitry Neverov <dmitry.neverov@gmail.com>
Date: Sun, 16 Oct 2016 15:48:08 +0300
Subject: [PATCH] Fix indent in constructor delegate call (KT-7718)

(cherry picked from commit 5699b14)

 #KT-7718 Fixed
---
 .../kotlin/idea/formatter/KotlinCommonBlock.kt       |  4 ++--
 .../formatter/SecondaryConstructors.after.kt         | 12 ++++++++++++
 idea/testData/formatter/SecondaryConstructors.kt     | 12 ++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
index ee45d05bc4c..a3f370b885f 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
@@ -337,8 +337,8 @@ private val INDENT_RULES = arrayOf<NodeIndentStrategy>(
                 .set(Indent.getNormalIndent()),
 
         strategy("Indent for parts")
-                .`in`(KtNodeTypes.PROPERTY, KtNodeTypes.FUN, KtNodeTypes.DESTRUCTURING_DECLARATION)
-                .notForType(KtNodeTypes.BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD)
+                .`in`(KtNodeTypes.PROPERTY, KtNodeTypes.FUN, KtNodeTypes.DESTRUCTURING_DECLARATION, KtNodeTypes.SECONDARY_CONSTRUCTOR)
+                .notForType(KtNodeTypes.BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, CONSTRUCTOR_KEYWORD)
                 .set(Indent.getContinuationWithoutFirstIndent()),
 
         strategy("Chained calls")
diff --git a/idea/testData/formatter/SecondaryConstructors.after.kt b/idea/testData/formatter/SecondaryConstructors.after.kt
index 681018c01e6..f69cddd0453 100644
--- a/idea/testData/formatter/SecondaryConstructors.after.kt
+++ b/idea/testData/formatter/SecondaryConstructors.after.kt
@@ -66,4 +66,16 @@ class A {
 
     constructor() : super() {
     }
+
+    constructor() :
+            this()
+
+    constructor()
+            : this()
+
+    constructor() :
+            super()
+
+    constructor()
+            : super()
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/SecondaryConstructors.kt b/idea/testData/formatter/SecondaryConstructors.kt
index 01582779bd3..31cd20d02cf 100644
--- a/idea/testData/formatter/SecondaryConstructors.kt
+++ b/idea/testData/formatter/SecondaryConstructors.kt
@@ -36,4 +36,16 @@ constructor():this() {}
     constructor(): this   ()
 
     constructor(): super(){}
+
+    constructor():
+    this()
+
+    constructor()
+    :this()
+
+    constructor():
+    super()
+
+    constructor()
+    :super()
 }
\ No newline at end of file