Kotlin: Add modifiers to object INSTANCEs

igfoo · igfoo · commit b460c92c61bc · 2022-05-10T19:51:01.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -889,6 +889,9 @@ open class KotlinFileExtractor(
             val type = useSimpleTypeClass(c, emptyList(), false)
             tw.writeFields(instance.id, instance.name, type.javaResult.id, type.kotlinResult.id, id, instance.id)
             tw.writeHasLocation(instance.id, locId)
+            tw.writeHasModifier(instance.id, extractModifier("public"))
+            tw.writeHasModifier(instance.id, extractModifier("static"))
+            tw.writeHasModifier(instance.id, extractModifier("final"))
             @Suppress("UNCHECKED_CAST")
             tw.writeClass_object(id as Label<DbClass>, instance.id)
         }
@@ -1675,6 +1678,14 @@ open class KotlinFileExtractor(
         }
     }
 
+    fun extractModifier(m: String): Label<DbModifier> {
+        val modifierLabel = "@\"modifier;$m\""
+        val id: Label<DbModifier> = tw.getLabelFor(modifierLabel, {
+            tw.writeModifiers(it, m)
+        })
+        return id
+    }
+
     fun extractTypeAccess(t: IrType, parent: Label<out DbExprparent>, idx: Int, elementForLocation: IrElement) {
         // TODO: elementForLocation allows us to give some sort of
         // location, but a proper location for the type access will
diff --git a/java/ql/test/kotlin/library-tests/object/objects.expected b/java/ql/test/kotlin/library-tests/object/objects.expected
@@ -1 +1 @@
-| objects.kt:2:1:4:1 | MyObject | objects.kt:2:1:4:1 | INSTANCE |
+| objects.kt:2:1:4:1 | MyObject | objects.kt:2:1:4:1 | INSTANCE | final,public,static |
diff --git a/java/ql/test/kotlin/library-tests/object/objects.ql b/java/ql/test/kotlin/library-tests/object/objects.ql
@@ -1,5 +1,6 @@
 import java
 
-from ClassObject co
+from ClassObject co, Field f
 where co.fromSource()
-select co, co.getInstance()
+  and f = co.getInstance()
+select co, f, concat(f.getAModifier().toString(), ",")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-\| objects.kt:2:1:4:1 \| MyObject \| objects.kt:2:1:4:1 \| INSTANCE \|`
	`1`	`+\| objects.kt:2:1:4:1 \| MyObject \| objects.kt:2:1:4:1 \| INSTANCE \| final,public,static \|`