Extract override modifier

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

@@ -703,6 +703,10 @@ open class KotlinFileExtractor(
                     addModifiers(id, "static")
                 }
 
+                if (f is IrSimpleFunction && f.overriddenSymbols.isNotEmpty()) {
+                    addModifiers(id, "override")
+                }
+
                 return id
             }
         }

java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql

@@ -21,6 +21,7 @@ from OverridingMethod m, Method overridden
 where
   m.fromSource() and
   m.overrides(overridden) and
+  not m.hasModifier("override") and
   not m.isOverrideAnnotated() and
   not exists(FunctionalExpr mref | mref.asMethod() = m)
 select m, "This method overrides $@; it is advisable to add an Override annotation.", overridden,

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

@@ -1,3 +0,0 @@
-| Test.kt:16:14:18:5 | m | This method overrides $@; it is advisable to add an Override annotation. | Test.kt:2:10:4:5 | m | A.m |
-| Test.kt:22:14:22:24 | o | This method overrides $@; it is advisable to add an Override annotation. | Test.kt:12:5:12:11 | o | I.o |
-| Test.kt:24:14:24:22 | getP | This method overrides $@; it is advisable to add an Override annotation. | Test.kt:8:10:8:18 | getP | A.getP |