Incorrect fix of null-safety rule

### What's done: Fixed logic and added more tests
saveourtool · Apr 30, 2021 · 91cfffb · 91cfffb
1 parent 5658521
commit 91cfffb
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 7 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt
@@ -110,7 +110,7 @@ class NullChecksRule(configRules: List<RulesConfig>) : DiktatRule(
                 astNode.hasChildOfType(BREAK) &&
                         (astNode.psi as? KtBlockExpression)?.statements?.size != 1
             } ?: false
-        return !(isBlockInIfWithBreak || isOneLineBlockInIfWithBreak)
+        return (!isBlockInIfWithBreak && !isOneLineBlockInIfWithBreak)
     }
 
     @Suppress("UnsafeCallOnNullableType", "TOO_LONG_FUNCTION")
@@ -126,7 +126,7 @@ class NullChecksRule(configRules: List<RulesConfig>) : DiktatRule(
                     if (condition.getBreakNodeFromIf(THEN)) {
                         "$variableName ?: break"
                     } else {
-                        "$variableName ?: run {\n${thenCodeLines?.joinToString(separator = "\n")}\n}"
+                        "$variableName ?: run {${thenCodeLines?.joinToString(prefix = "\n" , postfix = "\n", separator = "\n")}}"
                     }
                 thenCodeLines!!.singleOrNull() == "null" -> """
                         |$variableName?.let {
@@ -150,9 +150,9 @@ class NullChecksRule(configRules: List<RulesConfig>) : DiktatRule(
         } else {
             when {
                 elseCodeLines.isNullOrEmpty() || (elseCodeLines.singleOrNull() == "null") ->
-                    "$variableName?.let {\n${thenCodeLines?.joinToString(separator = "\n")}\n}"
+                    "$variableName?.let {${thenCodeLines?.joinToString(prefix = "\n" , postfix = "\n", separator = "\n")}}"
                 elseCodeLines.singleOrNull() == "break" ->
-                    "$variableName?.let {\n${thenCodeLines?.joinToString(separator = "\n")}\n} ?: break"
+                    "$variableName?.let {${thenCodeLines?.joinToString(prefix = "\n" , postfix = "\n", separator = "\n")}} ?: break"
                 else -> """
                         |$variableName?.let {
                         |${thenCodeLines?.joinToString(separator = "\n")}
@@ -203,9 +203,10 @@ class NullChecksRule(configRules: List<RulesConfig>) : DiktatRule(
 
     private fun ASTNode.getBreakNodeFromIf(type: IElementType) = this
         .treeParent
-        .findChildByType(type)?.let {
-            it.findChildByType(BLOCK) ?: it
-        }?.hasChildOfType(BREAK) ?: false
+        .findChildByType(type)
+        ?.let { it.findChildByType(BLOCK) ?: it }
+        ?.findAllNodesWithCondition({it.elementType == BREAK})?.isNotEmpty()
+        ?: false
 
     private fun ASTNode.extractLinesFromBlock(type: IElementType): List<String>? =
             treeParent

diff --git a/diktat-rules/src/test/resources/test/paragraph4/null_checks/IfConditionBreakCheckExpected.kt b/diktat-rules/src/test/resources/test/paragraph4/null_checks/IfConditionBreakCheckExpected.kt
@@ -57,3 +57,28 @@ fun foo() {
     }
 }
 
+fun foo() {
+    var result: Int? = 19
+    while(result != 0 ) {
+        if (result != null) {
+            foo()
+            break
+        } else {
+            break
+        }
+    }
+}
+
+fun foo() {
+    var result: Int? = 19
+    while(result != 0 ) {
+        if (result != null) {
+            result?.let {
+goo()
+} ?: break
+        } else {
+            break
+        }
+    }
+}
+
diff --git a/diktat-rules/src/test/resources/test/paragraph4/null_checks/IfConditionBreakCheckTest.kt b/diktat-rules/src/test/resources/test/paragraph4/null_checks/IfConditionBreakCheckTest.kt
@@ -63,3 +63,30 @@ fun foo() {
     }
 }
 
+fun foo() {
+    var result: Int? = 19
+    while(result != 0 ) {
+        if (result != null) {
+            foo()
+            break
+        } else {
+            break
+        }
+    }
+}
+
+fun foo() {
+    var result: Int? = 19
+    while(result != 0 ) {
+        if (result != null) {
+            if (result != null) {
+                goo()
+            } else {
+                break
+            }
+        } else {
+            break
+        }
+    }
+}
+