Revert the default value of extendedIndentOfParameters back to true

### What's done: * This reverts commits 0706885 and (partially) 9e3b5cb. * Closes: #1312
saveourtool · Jun 1, 2022 · 2bd0d8f · 2bd0d8f
1 parent 8aae73e
commit 2bd0d8f
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/diktat-analysis.yml b/diktat-analysis.yml
@@ -202,7 +202,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one
@@ -524,4 +524,4 @@
   enabled: true
 # Only properties from the primary constructor should be documented in a @property tag in class KDoc
 - name: KDOC_NO_CLASS_BODY_PROPERTIES_IN_HEADER
-  enabled: true
+  enabled: true
diff --git a/diktat-common/src/test/resources/test-rules-config.yml b/diktat-common/src/test/resources/test-rules-config.yml
@@ -125,7 +125,7 @@
   enabled: true
   configuration:
     newlineAtEnd: true
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     alignedParameters: true
     extendedIndentAfterOperators: true
     indentationSize: 4

diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt
@@ -15,7 +15,7 @@ internal class IndentationConfig(config: Map<String, String>) : RuleConfiguratio
     /**
      * If true, in parameter list when parameters are split by newline they are indented with two indentations instead of one
      */
-    val extendedIndentOfParameters = config["extendedIndentOfParameters"]?.toBoolean() ?: false
+    val extendedIndentOfParameters = config["extendedIndentOfParameters"]?.toBoolean() ?: true
 
     /**
      * If true, if first parameter in parameter list is on the same line as opening parenthesis, then other parameters

diff --git a/diktat-rules/src/main/resources/diktat-analysis-huawei.yml b/diktat-rules/src/main/resources/diktat-analysis-huawei.yml
@@ -204,7 +204,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one

diff --git a/diktat-rules/src/main/resources/diktat-analysis.yml b/diktat-rules/src/main/resources/diktat-analysis.yml
@@ -204,7 +204,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one

diff --git a/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt b/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt
@@ -396,19 +396,19 @@ class IndentationRuleWarnTest : LintTestBase(::IndentationRule) {
             """
                     |fun foo() {
                     |    consume(Example(
-                    |        t1, t2, t3
+                    |            t1, t2, t3
                     |    ))
                     |
                     |    bar(baz(
-                    |        1,
-                    |        2
+                    |            1,
+                    |            2
                     |    )
                     |    )
                     |
                     |    bar(baz(
-                    |        1,
-                    |        2),
-                    |        3
+                    |            1,
+                    |            2),
+                    |            3
                     |    )
                     |}
                     |
@@ -484,15 +484,15 @@ class IndentationRuleWarnTest : LintTestBase(::IndentationRule) {
             """
                     |fun foo() {
                     |    bar(
-                    |        param1 = baz(
-                    |            1,
-                    |            2
-                    |        ),
-                    |        param2 = { elem ->
-                    |            elem.qux()
-                    |        },
-                    |        param3 = x
-                    |                .y()
+                    |            param1 = baz(
+                    |                    1,
+                    |                    2
+                    |            ),
+                    |            param2 = { elem ->
+                    |                elem.qux()
+                    |            },
+                    |            param3 = x
+                    |                    .y()
                     |    )
                     |}
                     |

diff --git a/examples/gradle-groovy-dsl/diktat-analysis.yml b/examples/gradle-groovy-dsl/diktat-analysis.yml
@@ -204,7 +204,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one

diff --git a/examples/gradle-kotlin-dsl-multiproject/diktat-analysis.yml b/examples/gradle-kotlin-dsl-multiproject/diktat-analysis.yml
@@ -128,7 +128,7 @@
   enabled: true
   configuration:
     newlineAtEnd: true
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     alignedParameters: true
     extendedIndentAfterOperators: true
     indentationSize: 4

diff --git a/examples/gradle-kotlin-dsl/diktat-analysis.yml b/examples/gradle-kotlin-dsl/diktat-analysis.yml
@@ -204,7 +204,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one

diff --git a/examples/maven/diktat-analysis.yml b/examples/maven/diktat-analysis.yml
@@ -204,7 +204,7 @@
     # Is newline at the end of a file needed
     newlineAtEnd: true
     # If true: in parameter list when parameters are split by newline they are indented with two indentations instead of one
-    extendedIndentOfParameters: false
+    extendedIndentOfParameters: true
     # If true: if first parameter in parameter list is on the same line as opening parenthesis, then other parameters can be aligned with it
     alignedParameters: true
     # If true: if expression is split by newline after operator like +/-/`*`, then the next line is indented with two indentations instead of one