C#: Preserve the semantics of the cs/complex-condition query.

Author: michaelnebel

csharp/ql/src/Complexity/ComplexCondition.ql

@@ -12,19 +12,38 @@
 
 import csharp
 
-predicate nontrivialLogicalOperator(BinaryLogicalOperation e) {
-  not exists(BinaryLogicalOperation parent |
+abstract class RelevantBinaryOperations extends Operation { }
+
+private class AddBinaryLogicalOperationRelevantBinaryOperations extends RelevantBinaryOperations,
+  BinaryLogicalOperation
+{ }
+
+private class AddAssignCoalesceExprRelevantBinaryOperations extends RelevantBinaryOperations,
+  AssignCoalesceExpr
+{ }
+
+abstract class RelevantOperations extends Operation { }
+
+private class AddLogicalOperationRelevantOperations extends RelevantOperations, LogicalOperation { }
+
+private class AddAssignCoalesceExprRelevantOperations extends RelevantOperations, AssignCoalesceExpr
+{ }
+
+predicate nontrivialLogicalOperator(RelevantBinaryOperations e) {
+  not exists(RelevantBinaryOperations parent |
     parent = e.getParent() and
     parent.getOperator() = e.getOperator()
   )
 }
 
-predicate logicalParent(LogicalOperation op, LogicalOperation parent) { parent = op.getParent() }
+predicate logicalParent(RelevantOperations op, RelevantOperations parent) {
+  parent = op.getParent()
+}
 
 from Expr e, int operators
 where
-  not e.getParent() instanceof LogicalOperation and
+  not e.getParent() instanceof RelevantOperations and
   operators =
-    count(BinaryLogicalOperation op | logicalParent*(op, e) and nontrivialLogicalOperator(op)) and
+    count(RelevantBinaryOperations op | logicalParent*(op, e) and nontrivialLogicalOperator(op)) and
   operators > 3
 select e, "Complex condition: too many logical operations in this expression."