Honor "Use continuation indent in argument lists" for indent by Enter

#KT-22121 Fixed
2018-01-08 17:23:25 +01:00
parent d79ac58340
commit 8c7f57ca83
4 changed files with 25 additions and 15 deletions
@@ -262,10 +262,13 @@ abstract class KotlinCommonBlock(
                    ChildAttributes(block.indent, block.alignment)
                } else {
                    val indent =
-                        if (type == KtNodeTypes.VALUE_PARAMETER_LIST && !settings.kotlinCustomSettings.CONTINUATION_INDENT_IN_PARAMETER_LISTS)
+                        if ((type == KtNodeTypes.VALUE_PARAMETER_LIST && !settings.kotlinCustomSettings.CONTINUATION_INDENT_IN_PARAMETER_LISTS) ||
+                            (type == KtNodeTypes.VALUE_ARGUMENT_LIST && !settings.kotlinCustomSettings.CONTINUATION_INDENT_IN_ARGUMENT_LISTS)
+                        ) {
                            Indent.getNormalIndent()
-                        else
+                        } else {
                            Indent.getContinuationIndent()
+                        }
                    ChildAttributes(indent, null)
                }
            }