hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-22 19:56:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix declaring type of companion field

Browse Source
This commit is contained in:
Tamas Vajk
2022-05-10 14:38:09 +02:00
committed by Chris Smowton
parent a8cf0383cf
commit ccaafd74f3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
View File

@@ -457,7 +457,7 @@ open class KotlinFileExtractor(
val instance = useCompanionObjectClassInstance(innerDeclaration) val instance = useCompanionObjectClassInstance(innerDeclaration)
if (instance != null) { if (instance != null) {
val type = useSimpleTypeClass(innerDeclaration, emptyList(), false) val type = useSimpleTypeClass(innerDeclaration, emptyList(), false)
tw.writeFields(instance.id, instance.name, type.javaResult.id, innerId, instance.id) tw.writeFields(instance.id, instance.name, type.javaResult.id, parentId, instance.id)
tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id) tw.writeFieldsKotlinType(instance.id, type.kotlinResult.id)
tw.writeHasLocation(instance.id, innerLocId) tw.writeHasLocation(instance.id, innerLocId)
addModifiers(instance.id, "public", "static", "final") addModifiers(instance.id, "public", "static", "final")

4
java/ql/test/kotlin/library-tests/companion_objects/companion_objects.expected
View File

@@ -1,2 +1,2 @@
| companion_objects.kt:1:1:6:1 | MyClass | companion_objects.kt:3:5:5:5 | MyClassCompanion | companion_objects.kt:3:5:5:5 | MyClassCompanion | companion_objects.kt:3:5:5:5 | MyClassCompanion | final,public,static | | companion_objects.kt:1:1:6:1 | MyClass | companion_objects.kt:3:5:5:5 | MyClassCompanion | companion_objects.kt:3:5:5:5 | MyClassCompanion | companion_objects.kt:1:1:6:1 | MyClass | final,public,static |
| companion_objects.kt:8:1:13:1 | MyInterface | companion_objects.kt:10:5:12:5 | MyInterfaceCompanion | companion_objects.kt:10:5:12:5 | MyInterfaceCompanion | companion_objects.kt:10:5:12:5 | MyInterfaceCompanion | final,public,static | | companion_objects.kt:8:1:13:1 | MyInterface | companion_objects.kt:10:5:12:5 | MyInterfaceCompanion | companion_objects.kt:10:5:12:5 | MyInterfaceCompanion | companion_objects.kt:8:1:13:1 | MyInterface | final,public,static |