kt_*_types tables: cite correct Kotlin classid for arrays

smowton · igfoo · commit 2cc5f3e5b777 · 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
@@ -517,19 +517,19 @@ class X {
                 }
                 val javaSignature = "an array" // TODO: Wrong
                 val javaResult = TypeResult(id, javaSignature)
-                val aClassId = makeClass("kotlin", "Array") // TODO: Wrong
+                val kotlinClassName = getUnquotedClassLabel(s.classifier.owner as IrClass, s.arguments)
                 val kotlinResult = if (s.hasQuestionMark) {
                         val kotlinSignature = "$javaSignature?" // TODO: Wrong
-                        val kotlinLabel = "@\"kt_type;nullable;array\"" // TODO: Wrong
+                        val kotlinLabel = "@\"kt_type;nullable;${kotlinClassName}\""
                         val kotlinId: Label<DbKt_nullable_type> = tw.getLabelFor(kotlinLabel, {
-                            tw.writeKt_nullable_types(it, aClassId)
+                            tw.writeKt_nullable_types(it, id)
                         })
                         TypeResult(kotlinId, kotlinSignature)
                     } else {
                         val kotlinSignature = "$javaSignature" // TODO: Wrong
-                        val kotlinLabel = "@\"kt_type;notnull;array\"" // TODO: Wrong
+                        val kotlinLabel = "@\"kt_type;notnull;${kotlinClassName}\"" // TODO: Wrong
                         val kotlinId: Label<DbKt_notnull_type> = tw.getLabelFor(kotlinLabel, {
-                            tw.writeKt_notnull_types(it, aClassId)
+                            tw.writeKt_notnull_types(it, id)
                         })
                         TypeResult(kotlinId, kotlinSignature)
                     }
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -328,12 +328,12 @@ class_companion_object(
 
 kt_nullable_types(
   unique int id: @kt_nullable_type,
-  int classid: @classorinterface ref
+  int classid: @reftype ref
 )
 
 kt_notnull_types(
   unique int id: @kt_notnull_type,
-  int classid: @classorinterface ref
+  int classid: @reftype ref
 )
 
 kt_type_alias(

Original file line number	Diff line number	Diff line change
`@@ -328,12 +328,12 @@ class_companion_object(`
`328`	`328`
`329`	`329`	`kt_nullable_types(`
`330`	`330`	`unique int id: @kt_nullable_type,`
`331`		`- int classid: @classorinterface ref`
	`331`	`+ int classid: @reftype ref`
`332`	`332`	`)`
`333`	`333`
`334`	`334`	`kt_notnull_types(`
`335`	`335`	`unique int id: @kt_notnull_type,`
`336`		`- int classid: @classorinterface ref`
	`336`	`+ int classid: @reftype ref`
`337`	`337`	`)`
`338`	`338`
`339`	`339`	`kt_type_alias(`