From 26d47a034e9b2746c16077aa095d63c0b38ef68c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 17 Nov 2017 13:42:25 +0100
Subject: [PATCH] Don't indent closing parenthesis of a destructuring
 declaration

 #KT-20758 Fixed
---
 .../jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt  | 2 +-
 idea/testData/formatter/Multideclaration.after.kt         | 8 ++++++++
 idea/testData/formatter/Multideclaration.kt               | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

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 10ded6b351e..dd1da6f962f 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonBlock.kt
@@ -471,7 +471,7 @@ private val INDENT_RULES = arrayOf<NodeIndentStrategy>(
 
         strategy("Indent for parts")
                 .within(KtNodeTypes.PROPERTY, KtNodeTypes.FUN, KtNodeTypes.DESTRUCTURING_DECLARATION, KtNodeTypes.SECONDARY_CONSTRUCTOR)
-                .notForType(KtNodeTypes.BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, CONSTRUCTOR_KEYWORD)
+                .notForType(KtNodeTypes.BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, CONSTRUCTOR_KEYWORD, KtTokens.RPAR)
                 .set(Indent.getContinuationWithoutFirstIndent()),
 
         strategy("Chained calls")
diff --git a/idea/testData/formatter/Multideclaration.after.kt b/idea/testData/formatter/Multideclaration.after.kt
index 1ddac41485d..d2bbf5afaff 100644
--- a/idea/testData/formatter/Multideclaration.after.kt
+++ b/idea/testData/formatter/Multideclaration.after.kt
@@ -4,4 +4,12 @@ fun test() {
 
     val (c, d)
             = Pair(true, false)
+
+    val (
+            distributor,
+            items,
+            shippingMethods,
+            addresses,
+            preferredAddressId
+    ) = argument
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/Multideclaration.kt b/idea/testData/formatter/Multideclaration.kt
index 780724826ca..c42114090cc 100644
--- a/idea/testData/formatter/Multideclaration.kt
+++ b/idea/testData/formatter/Multideclaration.kt
@@ -4,4 +4,12 @@ fun test() {
 
     val (c, d)
     = Pair(true, false)
+
+    val (
+    distributor,
+    items,
+    shippingMethods,
+    addresses,
+    preferredAddressId
+    ) = argument
 }
\ No newline at end of file