factor out duplicate conditions and update .expected for A0-1-4

Author: jeongsoolee09

cpp/common/src/codingstandards/cpp/rules/unusedparameter/UnusedParameter.qll

@@ -21,20 +21,10 @@ predicate isLambdaParameter(Parameter parameter) {
 
 query predicate problems(UnusedParameter p, string message, Function f, string fName) {
   not isExcluded(p, getQuery()) and
-  if isLambdaParameter(p)
-  then (
-    not isMaybeUnusedParameter(p) and
-    f = p.getFunction() and
-    // Virtual functions are covered by a different rule
-    not f.isVirtual() and
-    message = "Unused parameter '" + p.getName() + "' for function $@." and
-    fName = "lambda expression"
-  ) else (
-    not isMaybeUnusedParameter(p) and
-    f = p.getFunction() and
-    // Virtual functions are covered by a different rule
-    not f.isVirtual() and
-    message = "Unused parameter '" + p.getName() + "' for function $@." and
-    fName = f.getQualifiedName()
-  )
+  not isMaybeUnusedParameter(p) and
+  (if isLambdaParameter(p) then fName = "lambda expression" else fName = f.getQualifiedName()) and
+  f = p.getFunction() and
+  // Virtual functions are covered by a different rule
+  not f.isVirtual() and
+  message = "Unused parameter '" + p.getName() + "' for function $@."
 }

cpp/common/test/rules/unusedparameter/UnusedParameter.expected

@@ -1,2 +1,3 @@
-| test.cpp:6:22:6:22 | x | Unused parameter 'x' for function $@. | test.cpp:6:6:6:16 | test_unused | test_unused |
-| test.cpp:14:14:14:14 | x | Unused parameter 'x' for function $@. | test.cpp:14:8:14:8 | b | A::b |
+| test.cpp:8:22:8:22 | x | Unused parameter 'x' for function $@. | test.cpp:8:6:8:16 | test_unused | test_unused |
+| test.cpp:16:14:16:14 | x | Unused parameter 'x' for function $@. | test.cpp:16:8:16:8 | b | A::b |
+| test.cpp:35:14:35:14 | y | Unused parameter 'y' for function $@. | test.cpp:34:9:34:9 | operator() | lambda expression |