Skip to content

Commit bee703a

Browse files
committed
Kotlin: Inline away useFunctionCommon
1 parent 3934491 commit bee703a

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,16 +1210,12 @@ open class KotlinUsesExtractor(
12101210
}
12111211

12121212
fun <T: DbCallable> useFunction(f: IrFunction, parentId: Label<out DbElement>?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?, noReplace: Boolean = false): Label<out T> {
1213-
return kotlinFunctionToJavaEquivalent(f, noReplace).let {
1214-
useFunction(it, getFunctionLabel(it, parentId, classTypeArgsIncludingOuterClasses))
1215-
}
1216-
}
1217-
1218-
private fun <T: DbCallable> useFunction(f: IrFunction, label: String): Label<out T> {
1213+
val javaFun = kotlinFunctionToJavaEquivalent(f, noReplace)
1214+
val label = getFunctionLabel(javaFun, parentId, classTypeArgsIncludingOuterClasses)
12191215
val id: Label<T> = tw.getLabelFor(label)
1220-
if (isExternalDeclaration(f)) {
1221-
extractFunctionLaterIfExternalFileMember(f)
1222-
extractExternalEnclosingClassLater(f)
1216+
if (isExternalDeclaration(javaFun)) {
1217+
extractFunctionLaterIfExternalFileMember(javaFun)
1218+
extractExternalEnclosingClassLater(javaFun)
12231219
}
12241220
return id
12251221
}

0 commit comments

Comments
 (0)