QL: fix

Author: erik-krogh

ql/src/codeql_ql/ast/Ast.qll

@@ -288,8 +288,16 @@ class ClassPredicate extends TClassPredicate, Predicate {
 
   override Class getParent() { result.getAClassPredicate() = this }
 
+  /**
+   * Holds if this predicate is private.
+   */
   predicate isPrivate() { hasAnnotation(this, "private") }
 
+  /**
+   * Holds if this predicate is annotated as overriding another predicate.
+   */
+  predicate isOverride() { hasAnnotation(this, "override") }
+
   override VarDecl getParameter(int i) {
     toGenerated(result) =
       rank[i](Generated::VarDecl decl, int index | decl = pred.getChild(index) | decl order by index)

ql/src/queries/style/MissingOverride.ql

@@ -15,6 +15,6 @@ string getQualifiedName(ClassPredicate p) {
 }
 
 from ClassPredicate pred, ClassPredicate sup
-where pred.overrides(sup) and not pred.hasAnnotation("override")
+where pred.overrides(sup) and not pred.isOverride()
 select pred, getQualifiedName(pred) + "overrides $@ but does not have an override annotation.", sup,
   getQualifiedName(sup)