Kotlin: Extract parameters

igfoo · igfoo · commit 4ba13d366330 · 2022-05-10T18:45:53.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -206,11 +206,12 @@ class KotlinFileExtractor(val tw: TrapWriter) {
     }
 
     fun useClass(c: IrClass): Label<out DbClass> {
-        if(c.name.asString() == "Unit" && tw.getExistingLabelFor<DbClass>(getClassLabel(c)) == null) {
-            return extractClass(c)
-        } else {
-            return addClassLabel(c)
+        if(c.name.asString() == "Any" || c.name.asString() == "Unit") {
+            if(tw.getExistingLabelFor<DbClass>(getClassLabel(c)) == null) {
+                return extractClass(c)
+            }
         }
+        return addClassLabel(c)
     }
 
     fun extractClass(c: IrClass): Label<out DbClass> {
@@ -256,6 +257,15 @@ class KotlinFileExtractor(val tw: TrapWriter) {
         return id
     }
 
+    fun extractValueParameter(vp: IrValueParameter, parent: Label<out DbMethod>, idx: Int) {
+        val id = tw.getFreshIdLabel<DbParam>()
+        val typeId = useType(vp.type)
+        val locId = tw.getLocation(vp.startOffset, vp.endOffset)
+        tw.writeParams(id, typeId, idx, parent, id)
+        tw.writeHasLocation(id, locId)
+        tw.writeParamName(id, vp.name.asString())
+    }
+
     fun extractFunction(f: IrFunction, parentid: Label<out DbPackage_or_reftype>) {
         val id = useFunction(f)
         val locId = tw.getLocation(f.startOffset, f.endOffset)
@@ -267,6 +277,9 @@ class KotlinFileExtractor(val tw: TrapWriter) {
         if(body != null) {
             extractBody(body, id)
         }
+        f.valueParameters.forEachIndexed { i, vp ->
+            extractValueParameter(vp, id, i)
+        }
     }
 
     fun useProperty(p: IrProperty): Label<out DbField> {
diff --git a/java/ql/test/kotlin/library-tests/variables/variables.expected b/java/ql/test/kotlin/library-tests/variables/variables.expected
@@ -1,2 +1,6 @@
+| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any |
+| variables.kt:0:0:0:0 | other | variables.kt:0:0:0:0 | Any |
+| variables.kt:2:1:8:1 | other | variables.kt:0:0:0:0 | Any |
 | variables.kt:3:5:3:21 | prop | file://:0:0:0:0 | int |
+| variables.kt:5:20:5:29 | param | file://:0:0:0:0 | int |
 | variables.kt:6:9:6:21 | int local | file://:0:0:0:0 | int |
