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

Kotlin: Refactor useFunction*

Browse Source 
They now work in a way more similar to other families of functions we
have.
This commit is contained in:
Ian Lynagh
2022-06-23 18:05:14 +01:00
parent ab19d8c3c3
commit 3934491dcc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
View File

@@ -1205,17 +1205,17 @@ open class KotlinUsesExtractor(
val ids = getLocallyVisibleFunctionLabels(f)
return ids.function.cast<T>()
} else {
val realFunction = kotlinFunctionToJavaEquivalent(f, noReplace)
return useFunctionCommon<T>(realFunction, getFunctionLabel(realFunction, classTypeArgsIncludingOuterClasses))
return useFunction(f, null, classTypeArgsIncludingOuterClasses, noReplace)
}
}
fun <T: DbCallable> useFunction(f: IrFunction, parentId: Label<out DbElement>, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?, noReplace: Boolean = false) =
kotlinFunctionToJavaEquivalent(f, noReplace).let {
useFunctionCommon<T>(it, getFunctionLabel(it, parentId, classTypeArgsIncludingOuterClasses))
fun <T: DbCallable> useFunction(f: IrFunction, parentId: Label<out DbElement>?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?, noReplace: Boolean = false): Label<out T> {
return kotlinFunctionToJavaEquivalent(f, noReplace).let {
useFunction(it, getFunctionLabel(it, parentId, classTypeArgsIncludingOuterClasses))
}
}
private fun <T: DbCallable> useFunctionCommon(f: IrFunction, label: String): Label<out T> {
private fun <T: DbCallable> useFunction(f: IrFunction, label: String): Label<out T> {
val id: Label<T> = tw.getLabelFor(label)
if (isExternalDeclaration(f)) {
extractFunctionLaterIfExternalFileMember(f)