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

Extract type access expression for function return types

Browse Source
This commit is contained in:
Tamas Vajk
2022-04-14 14:01:46 +02:00
committed by Ian Lynagh
parent dcac285a99
commit f557719fe5
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,6 +676,8 @@ open class KotlinFileExtractor(
val substReturnType = typeSubstitution?.let { it(f.returnType, TypeContext.RETURN, pluginContext) } ?: f.returnType
val locId = getLocation(f, classTypeArgsIncludingOuterClasses)
if (f.symbol is IrConstructorSymbol) {
val unitType = useType(pluginContext.irBuiltIns.unitType, TypeContext.RETURN)
val shortName = when {
@@ -692,9 +694,12 @@ open class KotlinFileExtractor(
val methodId = id.cast<DbMethod>()
tw.writeMethods(methodId, shortName, "$shortName$paramsSignature", returnType.javaResult.id, parentId, sourceDeclaration.cast<DbMethod>())
tw.writeMethodsKotlinType(methodId, returnType.kotlinResult.id)
if (!isExternalDeclaration(f)) {
extractTypeAccessRecursive(f.returnType, locId, id, -1)
}
}
val locId = getLocation(f, classTypeArgsIncludingOuterClasses)
tw.writeHasLocation(id, locId)
val body = f.body
if (body != null && extractBody) {