Kotlin: Use variable names more consistently

igfoo · igfoo · commit dd51141029ab · 2022-05-10T19:51:14.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -412,7 +412,7 @@ open class KotlinFileExtractor(
         }
 
         // add method:
-        val obinitLabel = getFunctionLabel(c, "<obinit>", listOf(), pluginContext.irBuiltIns.unitType, extensionReceiverParameter = null, functionTypeParameters = listOf(), classTypeArguments = listOf())
+        val obinitLabel = getFunctionLabel(c, "<obinit>", listOf(), pluginContext.irBuiltIns.unitType, extensionReceiverParameter = null, functionTypeParameters = listOf(), classTypeArgsIncludingOuterClasses = listOf())
         val obinitId = tw.getLabelFor<DbMethod>(obinitLabel)
         val returnType = useType(pluginContext.irBuiltIns.unitType)
         tw.writeMethods(obinitId, "<obinit>", "<obinit>()", returnType.javaResult.id, returnType.kotlinResult.id, parentId, obinitId)
@@ -1561,7 +1561,7 @@ open class KotlinFileExtractor(
                 val id = tw.getFreshIdLabel<DbMethodaccess>()
                 val type = useType(e.type)
                 val locId = tw.getLocation(e)
-                val methodLabel = getFunctionLabel(irCallable.parent, "<obinit>", listOf(), e.type, null, functionTypeParameters = listOf(), classTypeArguments = listOf())
+                val methodLabel = getFunctionLabel(irCallable.parent, "<obinit>", listOf(), e.type, null, functionTypeParameters = listOf(), classTypeArgsIncludingOuterClasses = listOf())
                 val methodId = tw.getLabelFor<DbMethod>(methodLabel)
                 tw.writeExprs_methodaccess(id, type.javaResult.id, type.kotlinResult.id, exprParent.parent, exprParent.idx)
                 tw.writeHasLocation(id, locId)
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -627,8 +627,8 @@ class X {
             else -> listOf()
         }
 
-    fun getFunctionLabel(f: IrFunction, classTypeArguments: List<IrTypeArgument>? = null) : String {
-        return getFunctionLabel(f.parent, getFunctionShortName(f), f.valueParameters, f.returnType, f.extensionReceiverParameter, getFunctionTypeParameters(f), classTypeArguments)
+    fun getFunctionLabel(f: IrFunction, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>? = null) : String {
+        return getFunctionLabel(f.parent, getFunctionShortName(f), f.valueParameters, f.returnType, f.extensionReceiverParameter, getFunctionTypeParameters(f), classTypeArgsIncludingOuterClasses)
     }
 
     fun getEnclosingClass(it: IrDeclarationParent): IrClass? =
@@ -645,10 +645,10 @@ class X {
         returnType: IrType,
         extensionReceiverParameter: IrValueParameter?,
         functionTypeParameters: List<IrTypeParameter>,
-        classTypeArguments: List<IrTypeArgument>?
+        classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?
     ): String {
-        val parentId = useDeclarationParent(parent, false, classTypeArguments, true)
-        return getFunctionLabel(parent, parentId, name, parameters, returnType, extensionReceiverParameter, functionTypeParameters, classTypeArguments)
+        val parentId = useDeclarationParent(parent, false, classTypeArgsIncludingOuterClasses, true)
+        return getFunctionLabel(parent, parentId, name, parameters, returnType, extensionReceiverParameter, functionTypeParameters, classTypeArgsIncludingOuterClasses)
     }
 
     fun getFunctionLabel(f: IrFunction, parentId: Label<out DbElement>, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) =
@@ -751,13 +751,13 @@ class X {
         return id
     }
 
-    fun <T: DbCallable> useFunction(f: IrFunction, classTypeArguments: List<IrTypeArgument>? = null): Label<out T> {
+    fun <T: DbCallable> useFunction(f: IrFunction, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>? = null): Label<out T> {
         if (f.isLocalFunction()) {
             val ids = getLocallyVisibleFunctionLabels(f)
             @Suppress("UNCHECKED_CAST")
             return ids.function as Label<out T>
         } else {
-            return useFunctionCommon<T>(f, getFunctionLabel(f, classTypeArguments))
+            return useFunctionCommon<T>(f, getFunctionLabel(f, classTypeArgsIncludingOuterClasses))
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -627,8 +627,8 @@ class X {`
`627`	`627`	`else -> listOf()`
`628`	`628`	`}`
`629`	`629`
`630`		`- fun getFunctionLabel(f: IrFunction, classTypeArguments: List<IrTypeArgument>? = null) : String {`
`631`		`- return getFunctionLabel(f.parent, getFunctionShortName(f), f.valueParameters, f.returnType, f.extensionReceiverParameter, getFunctionTypeParameters(f), classTypeArguments)`
	`630`	`+ fun getFunctionLabel(f: IrFunction, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>? = null) : String {`
	`631`	`+ return getFunctionLabel(f.parent, getFunctionShortName(f), f.valueParameters, f.returnType, f.extensionReceiverParameter, getFunctionTypeParameters(f), classTypeArgsIncludingOuterClasses)`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`fun getEnclosingClass(it: IrDeclarationParent): IrClass? =`
`@@ -645,10 +645,10 @@ class X {`
`645`	`645`	`returnType: IrType,`
`646`	`646`	`extensionReceiverParameter: IrValueParameter?,`
`647`	`647`	`functionTypeParameters: List<IrTypeParameter>,`
`648`		`- classTypeArguments: List<IrTypeArgument>?`
	`648`	`+ classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?`
`649`	`649`	`): String {`
`650`		`- val parentId = useDeclarationParent(parent, false, classTypeArguments, true)`
`651`		`- return getFunctionLabel(parent, parentId, name, parameters, returnType, extensionReceiverParameter, functionTypeParameters, classTypeArguments)`
	`650`	`+ val parentId = useDeclarationParent(parent, false, classTypeArgsIncludingOuterClasses, true)`
	`651`	`+ return getFunctionLabel(parent, parentId, name, parameters, returnType, extensionReceiverParameter, functionTypeParameters, classTypeArgsIncludingOuterClasses)`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`fun getFunctionLabel(f: IrFunction, parentId: Label<out DbElement>, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) =`
`@@ -751,13 +751,13 @@ class X {`
`751`	`751`	`return id`
`752`	`752`	`}`
`753`	`753`
`754`		`- fun <T: DbCallable> useFunction(f: IrFunction, classTypeArguments: List<IrTypeArgument>? = null): Label<out T> {`
	`754`	`+ fun <T: DbCallable> useFunction(f: IrFunction, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>? = null): Label<out T> {`
`755`	`755`	`if (f.isLocalFunction()) {`
`756`	`756`	`val ids = getLocallyVisibleFunctionLabels(f)`
`757`	`757`	`@Suppress("UNCHECKED_CAST")`
`758`	`758`	`return ids.function as Label<out T>`
`759`	`759`	`} else {`
`760`		`- return useFunctionCommon<T>(f, getFunctionLabel(f, classTypeArguments))`
	`760`	`+ return useFunctionCommon<T>(f, getFunctionLabel(f, classTypeArgsIncludingOuterClasses))`
`761`	`761`	`}`
`762`	`762`	`}`
`763`	`763`