hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-24 04:36:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure Unit type is extracted when needed

Browse Source
This commit is contained in:
Chris Smowton
2021-10-29 18:25:49 +01:00
committed by Ian Lynagh
parent efe3a77efe
commit 660988d8ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,7 +457,7 @@ open class KotlinUsesExtractor(
})
return classId
}
fun primitiveType(primitiveName: String?,
fun primitiveType(kotlinClass: IrClass, primitiveName: String?,
javaPackageName: String, javaClassName: String,
kotlinPackageName: String, kotlinClassName: String): TypeResults {
val javaResult = if (canReturnPrimitiveTypes && !s.hasQuestionMark && primitiveName != null) {
@@ -470,7 +470,7 @@ open class KotlinUsesExtractor(
val signature = "$javaPackageName.$javaClassName" // TODO: Is this right?
TypeResult(label, signature)
}
val kotlinClassId = makeClass(kotlinPackageName, kotlinClassName)
val kotlinClassId = useClassInstance(kotlinClass, listOf()).classLabel
val kotlinResult = if (s.hasQuestionMark) {
val kotlinSignature = "$kotlinPackageName.$kotlinClassName?" // TODO: Is this right?
val kotlinLabel = "@\"kt_type;nullable;$kotlinPackageName.$kotlinClassName\""