### Whats added:

* corrected logic fix and warn String Template in LineLength rule * added logic fix and warn long Dot Qualified Expression and Safe Access Expression in LineLength rule * added logic fix and warn Value Arguments List in LineLength rule * added and corrected fix and warn tests in LineLength rule * fix code with diktat:fix@diktat * added comments to classes and functions * correct code with running detect ### Issue (#1243)
saveourtool · Jun 1, 2022 · dfcf81a · dfcf81a
1 parent f8a817a
commit dfcf81a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt
@@ -140,7 +140,7 @@ class NewlinesRule(configRules: List<RulesConfig>) : DiktatRule(
                     val whiteSpaceBeforeDotOrSafeAccess = it.findChildByType(DOT)?.treePrev ?: it.findChildByType(SAFE_ACCESS)?.treePrev
                     whiteSpaceBeforeDotOrSafeAccess?.elementType == WHITE_SPACE && whiteSpaceBeforeDotOrSafeAccess.text.lines().size > 1
                 }
-                if (without.size != 1 || without[0] != listDot[0]) {
+                if (without.size > 1 || (without.size == 1 && without[0] != listDot[0])) {
                     WRONG_NEWLINES.warnAndFix(configRules, emitWarn, isFixMode, node.text, node.startOffset, node) {
                         fixDotQualifiedExpression(listDot)
                     }

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt
@@ -232,8 +232,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
                     |        }
                     |        ?.qux()
                     |}
-            """.trimMargin(),
-            LintError(2, 5, ruleId, "${WRONG_NEWLINES.warnText()} list!!...", true)
+            """.trimMargin()
         )
     }
 
@@ -636,7 +635,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) {
                     |           }
                     |        }
                     |}
-            """.trimMargin(), LintError(22, 9, ruleId, "${WRONG_NEWLINES.warnText()} allProperties...", true)
+            """.trimMargin()
         )
     }