hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-02 20:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kotlin: Add support for supertypes

Browse Source
This commit is contained in:
Ian Lynagh
2021-09-02 13:20:50 +01:00
parent d10024e7e9
commit a40ebd2520
5 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
View File

@@ -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
}

1
java/ql/test/kotlin/library-tests/classes/classes.expected
View File

@@ -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 |

5
java/ql/test/kotlin/library-tests/classes/classes.kt
View File

@@ -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() {
}

6
java/ql/test/kotlin/library-tests/classes/superTypes.expected Normal file
View File

@@ -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 |

5
java/ql/test/kotlin/library-tests/classes/superTypes.ql Normal file
View File

@@ -0,0 +1,5 @@
import java
from Class c
select c, c.getASupertype()