Kotlin: Fix up things that got pulled out into KotlinUsesExtractor

igfoo · igfoo · commit b381556a06ea · 2022-05-10T19:51:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -352,7 +352,7 @@ open class KotlinUsesExtractor(
 
     fun extractClassInstance(c: IrClass, typeArgs: List<IrTypeArgument>): Label<out DbClassorinterface> {
         if (typeArgs.isEmpty()) {
-            // TODO logger.warnElement(Severity.ErrorSevere, "Instance without type arguments: " + c.name.asString(), c)
+            logger.warn(Severity.ErrorSevere, "Instance without type arguments: " + c.name.asString())
         }
 
         val id = addClassLabel(c, typeArgs)
@@ -378,7 +378,7 @@ open class KotlinUsesExtractor(
         }
 
         for ((idx, arg) in typeArgs.withIndex()) {
-            val argId = getTypeArgumentLabel(arg, c)
+            val argId = getTypeArgumentLabel(arg)
             tw.writeTypeArgs(argId, idx, id)
         }
         tw.writeIsParameterized(id)
@@ -572,7 +572,7 @@ class X {
             is IrClass -> return useClassSource(dp)
             is IrFunction -> return useFunction(dp)
             else -> {
-                // TODO logger.warnElement(Severity.ErrorSevere, "Unrecognised IrDeclarationParent: " + dp.javaClass, dp)
+                logger.warn(Severity.ErrorSevere, "Unrecognised IrDeclarationParent: " + dp.javaClass)
                 return fakeLabel()
             }
         }
@@ -597,8 +597,7 @@ class X {
     }
 
     fun getTypeArgumentLabel(
-        arg: IrTypeArgument,
-        reportOn: IrElement
+        arg: IrTypeArgument
     ): Label<out DbReftype> {
         when (arg) {
             is IrStarProjection -> {
@@ -613,7 +612,7 @@ class X {
                 return useTypeOld(arg.type, false) as Label<out DbReftype>
             }
             else -> {
-                // TODO logger.warnElement(Severity.ErrorSevere, "Unexpected type argument.", reportOn)
+                logger.warn(Severity.ErrorSevere, "Unexpected type argument.")
                 return fakeLabel()
             }
         }
@@ -633,7 +632,7 @@ class X {
         }
 
         for (arg in typeArgs) {
-            val argId = getTypeArgumentLabel(arg, c)
+            val argId = getTypeArgumentLabel(arg)
             label += ";{$argId}"
         }
 
@@ -668,7 +667,7 @@ class X {
             return extractTypeParameter(param)
         }
 
-        // TODO logger.warnElement(Severity.ErrorSevere, "Missing type parameter label", param)
+        logger.warn(Severity.ErrorSevere, "Missing type parameter label")
         return tw.getLabelFor(l)
     }
 
@@ -681,6 +680,7 @@ class X {
             is IrClass -> useClassSource(parent)
             else -> {
                 // TODO logger.warnElement(Severity.ErrorSevere, "Unexpected type parameter parent", tp)
+                logger.warn(Severity.ErrorSevere, "Unexpected type parameter parent")
                 fakeLabel()
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ open class KotlinUsesExtractor(`
`352`	`352`
`353`	`353`	`fun extractClassInstance(c: IrClass, typeArgs: List<IrTypeArgument>): Label<out DbClassorinterface> {`
`354`	`354`	`if (typeArgs.isEmpty()) {`
`355`		`- // TODO logger.warnElement(Severity.ErrorSevere, "Instance without type arguments: " + c.name.asString(), c)`
	`355`	`+ logger.warn(Severity.ErrorSevere, "Instance without type arguments: " + c.name.asString())`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`val id = addClassLabel(c, typeArgs)`
`@@ -378,7 +378,7 @@ open class KotlinUsesExtractor(`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`for ((idx, arg) in typeArgs.withIndex()) {`
`381`		`- val argId = getTypeArgumentLabel(arg, c)`
	`381`	`+ val argId = getTypeArgumentLabel(arg)`
`382`	`382`	`tw.writeTypeArgs(argId, idx, id)`
`383`	`383`	`}`
`384`	`384`	`tw.writeIsParameterized(id)`
`@@ -572,7 +572,7 @@ class X {`
`572`	`572`	`is IrClass -> return useClassSource(dp)`
`573`	`573`	`is IrFunction -> return useFunction(dp)`
`574`	`574`	`else -> {`
`575`		`- // TODO logger.warnElement(Severity.ErrorSevere, "Unrecognised IrDeclarationParent: " + dp.javaClass, dp)`
	`575`	`+ logger.warn(Severity.ErrorSevere, "Unrecognised IrDeclarationParent: " + dp.javaClass)`
`576`	`576`	`return fakeLabel()`
`577`	`577`	`}`
`578`	`578`	`}`
`@@ -597,8 +597,7 @@ class X {`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`fun getTypeArgumentLabel(`
`600`		`- arg: IrTypeArgument,`
`601`		`- reportOn: IrElement`
	`600`	`+ arg: IrTypeArgument`
`602`	`601`	`): Label<out DbReftype> {`
`603`	`602`	`when (arg) {`
`604`	`603`	`is IrStarProjection -> {`
`@@ -613,7 +612,7 @@ class X {`
`613`	`612`	`return useTypeOld(arg.type, false) as Label<out DbReftype>`
`614`	`613`	`}`
`615`	`614`	`else -> {`
`616`		`- // TODO logger.warnElement(Severity.ErrorSevere, "Unexpected type argument.", reportOn)`
	`615`	`+ logger.warn(Severity.ErrorSevere, "Unexpected type argument.")`
`617`	`616`	`return fakeLabel()`
`618`	`617`	`}`
`619`	`618`	`}`
`@@ -633,7 +632,7 @@ class X {`
`633`	`632`	`}`
`634`	`633`
`635`	`634`	`for (arg in typeArgs) {`
`636`		`- val argId = getTypeArgumentLabel(arg, c)`
	`635`	`+ val argId = getTypeArgumentLabel(arg)`
`637`	`636`	`label += ";{$argId}"`
`638`	`637`	`}`
`639`	`638`
`@@ -668,7 +667,7 @@ class X {`
`668`	`667`	`return extractTypeParameter(param)`
`669`	`668`	`}`
`670`	`669`
`671`		`- // TODO logger.warnElement(Severity.ErrorSevere, "Missing type parameter label", param)`
	`670`	`+ logger.warn(Severity.ErrorSevere, "Missing type parameter label")`
`672`	`671`	`return tw.getLabelFor(l)`
`673`	`672`	`}`
`674`	`673`
`@@ -681,6 +680,7 @@ class X {`
`681`	`680`	`is IrClass -> useClassSource(parent)`
`682`	`681`	`else -> {`
`683`	`682`	`// TODO logger.warnElement(Severity.ErrorSevere, "Unexpected type parameter parent", tp)`
	`683`	`+ logger.warn(Severity.ErrorSevere, "Unexpected type parameter parent")`
`684`	`684`	`fakeLabel()`
`685`	`685`	`}`
`686`	`686`	`}`