QL: Exclude overridden fields from FieldOnlyUsedInCharPred.ql

Author: hvitved

ql/ql/src/queries/style/FieldOnlyUsedInCharPred.ql

@@ -21,5 +21,6 @@ where
     any(PredicateCall call |
       call.getEnclosingPredicate() = c.getCharPred() and call.getTarget() instanceof NewTypeBranch
     ).getAnArgument() and
-  not f.getVarDecl().overrides(_)
+  not f.getVarDecl().overrides(_) and
+  not any(FieldDecl other).getVarDecl().overrides(f.getVarDecl())
 select f, "Field is only used in CharPred."

ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.expected

@@ -1,2 +1 @@
 | FieldOnlyUsedInCharPred.qll:2:3:2:12 | FieldDecl | Field is only used in CharPred. |
-| FieldOnlyUsedInCharPred.qll:22:3:22:11 | FieldDecl | Field is only used in CharPred. |