SONARKT-286 Fix S6619 false positives caused by resolving binary expr…

…ession operations too far (#393)
SonarSource · Nov 27, 2023 · 47b8384 · 47b8384
1 parent f03be39
commit 47b8384
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/kotlin-checks-test-sources/src/main/kotlin/checks/UselessNullCheckCheckSample.kt b/kotlin-checks-test-sources/src/main/kotlin/checks/UselessNullCheckCheckSample.kt
@@ -127,3 +127,10 @@ private fun <E : Throwable> moo(exception: E) =
         cachedCtor(exception) as E?
     }
 
+private class FooBar(
+    something: Any
+) {
+    private val someString: String? = something as? String
+    val isString: Boolean
+        get() = someString != null // Compliant
+}
diff --git a/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/UselessNullCheckCheck.kt b/sonar-kotlin-checks/src/main/java/org/sonarsource/kotlin/checks/UselessNullCheckCheck.kt
@@ -113,12 +113,12 @@ class UselessNullCheckCheck : AbstractCheck() {
     }
 
     private fun KtBinaryExpression.operandComparedToNull(bc: BindingContext): KtExpression? {
-        val left = left?.predictRuntimeValueExpression(bc) ?: return null
-        val right = right?.predictRuntimeValueExpression(bc) ?: return null
+        val leftResolved = left?.predictRuntimeValueExpression(bc) ?: return null
+        val rightResolved = right?.predictRuntimeValueExpression(bc) ?: return null
 
         return when {
-            left.isNull() -> right
-            right.isNull() -> left
+            leftResolved.isNull() -> right
+            rightResolved.isNull() -> left
             else -> null
         }
     }