Merge pull request #11284 from tamasvajk/kotlin-complex-bool-expr

Kotlin: Exclude .kt files from `java/complex-boolean-expression`

Author: tamasvajk

java/ql/src/Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql

@@ -92,13 +92,16 @@ class ComparisonOrEquality extends BinaryExpr {
 
 from Expr e, string pattern, string rewrite
 where
-  e.(BoolCompare).simplify(pattern, rewrite)
-  or
-  conditionalWithBool(e, pattern, rewrite)
-  or
-  e.(LogNotExpr).getExpr().(ComparisonOrEquality).negate(pattern, rewrite)
-  or
-  e.(LogNotExpr).getExpr() instanceof LogNotExpr and
-  pattern = "!!A" and
-  rewrite = "A"
+  e.getFile().isJavaSourceFile() and
+  (
+    e.(BoolCompare).simplify(pattern, rewrite)
+    or
+    conditionalWithBool(e, pattern, rewrite)
+    or
+    e.(LogNotExpr).getExpr().(ComparisonOrEquality).negate(pattern, rewrite)
+    or
+    e.(LogNotExpr).getExpr() instanceof LogNotExpr and
+    pattern = "!!A" and
+    rewrite = "A"
+  )
 select e, "Expressions of the form \"" + pattern + "\" can be simplified to \"" + rewrite + "\"."

java/ql/test/kotlin/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.expected

@@ -0,0 +1,13 @@
+fun main() {
+    f(null)
+    f(true)
+    f(false)
+}
+
+fun f(x: Boolean?) {
+    if(x == true) {
+        println("Yes")
+    } else {
+        println("No")
+    }
+}

java/ql/test/kotlin/query-tests/SimplifyBoolExpr/SimplifyBoolExpr.kt

@@ -0,0 +1 @@
+Violations of Best Practice/Boolean Logic/SimplifyBoolExpr.ql