Kotlin: Tweak logging

igfoo · igfoo · commit 1ff6ada9550d · 2022-05-10T19:51:23.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -37,19 +37,23 @@ open class KotlinFileExtractor(
 ): KotlinUsesExtractor(logger, tw, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext, globalExtensionState) {
 
     inline fun <T> with(kind: String, element: IrElement, f: () -> T): T {
+        val name = when (element) {
+            is IrFile -> element.name
+            is IrDeclarationWithName -> element.name.asString()
+            else -> "<no name>"
+        }
         val loc = tw.getLocationString(element)
         val context = logger.loggerBase.extractorContextStack
-        context.push(ExtractorContext(kind, element, loc))
+        context.push(ExtractorContext(kind, element, name, loc))
         try {
             val depth = context.size
             val depthDescription = "${"-".repeat(depth)} (${depth.toString()})"
-            val name = (element as? IrDeclarationWithName)?.name?.asString() ?: "<no name>"
             logger.trace("$depthDescription: Starting a $kind ($name) at $loc")
             val result = f()
             logger.trace("$depthDescription: Finished a $kind ($name) at $loc")
             return result
         } catch(exception: Exception) {
-            throw Exception("While extracting a $kind at $loc", exception)
+            throw Exception("While extracting a $kind ($name) at $loc", exception)
         } finally {
             context.pop()
         }
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor/src/main/kotlin/utils/Logger.kt
@@ -33,7 +33,7 @@ enum class Severity(val sev: Int) {
     ErrorGlobal(8)
 }
 
-data class ExtractorContext(val kind: String, val element: IrElement, val loc: String)
+data class ExtractorContext(val kind: String, val element: IrElement, val name: String, val loc: String)
 
 open class LoggerBase(val logCounter: LogCounter) {
     val extractorContextStack = Stack<ExtractorContext>()
@@ -106,7 +106,7 @@ open class LoggerBase(val logCounter: LogCounter) {
         val iter = extractorContextStack.listIterator(extractorContextStack.size)
         while (iter.hasPrevious()) {
             val x = iter.previous()
-            fullMsgBuilder.append("  ...while extracting a ${x.kind} at ${x.loc}\n")
+            fullMsgBuilder.append("  ...while extracting a ${x.kind} (${x.name}) at ${x.loc}\n")
         }
         fullMsgBuilder.append(suffix)
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ enum class Severity(val sev: Int) {`
`33`	`33`	`ErrorGlobal(8)`
`34`	`34`	`}`
`35`	`35`
`36`		`-data class ExtractorContext(val kind: String, val element: IrElement, val loc: String)`
	`36`	`+data class ExtractorContext(val kind: String, val element: IrElement, val name: String, val loc: String)`
`37`	`37`
`38`	`38`	`open class LoggerBase(val logCounter: LogCounter) {`
`39`	`39`	`val extractorContextStack = Stack<ExtractorContext>()`
`@@ -106,7 +106,7 @@ open class LoggerBase(val logCounter: LogCounter) {`
`106`	`106`	`val iter = extractorContextStack.listIterator(extractorContextStack.size)`
`107`	`107`	`while (iter.hasPrevious()) {`
`108`	`108`	`val x = iter.previous()`
`109`		`- fullMsgBuilder.append(" ...while extracting a ${x.kind} at ${x.loc}\n")`
	`109`	`+ fullMsgBuilder.append(" ...while extracting a ${x.kind} (${x.name}) at ${x.loc}\n")`
`110`	`110`	`}`
`111`	`111`	`fullMsgBuilder.append(suffix)`
`112`	`112`