Extract override modifier

tamasvajk · igfoo · commit 505ccbbcf632 · 2022-05-10T19:51:28.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/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
             }
         }
diff --git a/java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql b/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,
diff --git a/java/ql/test/kotlin/query-tests/MissingOverrideAnnotation/MissingOverrideAnnotation.expected b/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 |

Original file line number	Diff line number	Diff line change
`@@ -703,6 +703,10 @@ open class KotlinFileExtractor(`
`703`	`703`	`addModifiers(id, "static")`
`704`	`704`	`}`
`705`	`705`
	`706`	`+ if (f is IrSimpleFunction && f.overriddenSymbols.isNotEmpty()) {`
	`707`	`+ addModifiers(id, "override")`
	`708`	`+ }`
	`709`	`+`
`706`	`710`	`return id`
`707`	`711`	`}`
`708`	`712`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-\| 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 \|`
`2`		`-\| 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 \|`
`3`		`-\| 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 \|`