Kotlin: Add support for supertypes

igfoo · igfoo · commit a40ebd252061 · 2022-05-10T18:45:55.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -312,6 +312,24 @@ class KotlinFileExtractor(val logger: Logger, val tw: TrapWriter, val file: IrFi
         val pkgId = extractPackage(pkg)
         tw.writeClasses(id, cls, pkgId, id)
         tw.writeHasLocation(id, locId)
+        for(t in c.superTypes) {
+            when(t) {
+                is IrSimpleType -> {
+                    when {
+                        t.classifier.owner is IrClass -> {
+                            val classifier: IrClassifierSymbol = t.classifier
+                            val tcls: IrClass = classifier.owner as IrClass
+                            val l = useClass(tcls)
+                            tw.writeExtendsReftype(id, l)
+                        } else -> {
+                            logger.warn("Unexpected simple type supertype: " + t.javaClass + ": " + t.render())
+                        }
+                    }
+                } else -> {
+                    logger.warn("Unexpected supertype: " + t.javaClass + ": " + t.render())
+                }
+            }
+        }
         c.declarations.map { extractDeclaration(it, Optional.of(id)) }
         return id
     }
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.expected b/java/ql/test/kotlin/library-tests/classes/classes.expected
@@ -4,3 +4,4 @@
 | classes.kt:4:1:6:1 | ClassTwo |
 | classes.kt:8:1:10:1 | ClassThree |
 | classes.kt:12:1:15:1 | ClassFour |
+| classes.kt:17:1:18:1 | ClassFive |
diff --git a/java/ql/test/kotlin/library-tests/classes/classes.kt b/java/ql/test/kotlin/library-tests/classes/classes.kt
@@ -9,7 +9,10 @@ abstract class ClassThree {
     abstract fun foo(arg: Int)
 }
 
-class ClassFour: ClassThree() {
+open class ClassFour: ClassThree() {
     override fun foo(arg: Int) {
     }
 }
+
+class ClassFive: ClassFour() {
+}
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.expected b/java/ql/test/kotlin/library-tests/classes/superTypes.expected
@@ -0,0 +1,6 @@
+| classes.kt:0:0:0:0 | Unit | classes.kt:0:0:0:0 | Any |
+| classes.kt:2:1:2:18 | ClassOne | classes.kt:0:0:0:0 | Any |
+| classes.kt:4:1:6:1 | ClassTwo | classes.kt:0:0:0:0 | Any |
+| classes.kt:8:1:10:1 | ClassThree | classes.kt:0:0:0:0 | Any |
+| classes.kt:12:1:15:1 | ClassFour | classes.kt:8:1:10:1 | ClassThree |
+| classes.kt:17:1:18:1 | ClassFive | classes.kt:12:1:15:1 | ClassFour |
diff --git a/java/ql/test/kotlin/library-tests/classes/superTypes.ql b/java/ql/test/kotlin/library-tests/classes/superTypes.ql
@@ -0,0 +1,5 @@
+import java
+
+from Class c
+select c, c.getASupertype()
+

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ abstract class ClassThree {`
`9`	`9`	`abstract fun foo(arg: Int)`
`10`	`10`	`}`
`11`	`11`
`12`		`-class ClassFour: ClassThree() {`
	`12`	`+open class ClassFour: ClassThree() {`
`13`	`13`	`override fun foo(arg: Int) {`
`14`	`14`	`}`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+class ClassFive: ClassFour() {`
	`18`	`+}`