From ce45b0e1d7534fcb6000134dcd32fea83799d9d1 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Mon, 9 Sep 2024 15:20:03 +0100
Subject: [PATCH] KE2: TrapWriter: Use the BasicLogger interface

This will allow FileTrapWriters to log via their FileLogger, which means
it will have access to file-specific state
---
 .../src/main/kotlin/TrapWriter.kt             | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
index 72c245d1c8b..9688dff89a2 100644
--- a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
@@ -69,7 +69,7 @@ OLD: KE1
  * they must all share the same `TrapLabelManager` and `BufferedWriter`.
  */
 abstract class TrapWriter(
-    protected val loggerBase: LoggerBase,
+    protected val basicLogger: BasicLogger,
     val lm: TrapLabelManager,
     private val bw: BufferedWriter
 ) {
@@ -235,7 +235,7 @@ OLD: KE1
         val len = str.length
         val newLen = UTF8Util.encodablePrefixLength(str, MAX_STRLEN)
         if (newLen < len) {
-            loggerBase.warn(
+            basicLogger.warn(
                 this.getDiagnosticTrapWriter(),
                 "Truncated string of length $len",
                 "Truncated string of length $len, starting '${str.take(100)}', ending '${str.takeLast(100)}'"
@@ -254,7 +254,7 @@ OLD: KE1
      */
     fun makeFileTrapWriter(filePath: String, populateFileTables: Boolean) =
         FileTrapWriter(
-            loggerBase,
+            basicLogger,
             lm,
             bw,
             this.getDiagnosticTrapWriter(),
@@ -269,7 +269,7 @@ OLD: KE1
 */
     fun makeSourceFileTrapWriter(file: KtFile, populateFileTables: Boolean) =
         SourceFileTrapWriter(
-            loggerBase,
+            basicLogger,
             lm,
             bw,
             this.getDiagnosticTrapWriter(),
@@ -280,11 +280,11 @@ OLD: KE1
 
 /** A `PlainTrapWriter` has no additional context of its own. */
 class PlainTrapWriter(
-    loggerBase: LoggerBase,
+    basicLogger: BasicLogger,
     lm: TrapLabelManager,
     bw: BufferedWriter,
     val dtw: DiagnosticTrapWriter
-) : TrapWriter(loggerBase, lm, bw) {
+) : TrapWriter(basicLogger, lm, bw) {
     override fun getDiagnosticTrapWriter(): DiagnosticTrapWriter {
         return dtw
     }
@@ -295,8 +295,8 @@ class PlainTrapWriter(
  * the #compilation label defined. In practice, this means that it is a TrapWriter for the
  * invocation TRAP file.
  */
-class DiagnosticTrapWriter(loggerBase: LoggerBase, lm: TrapLabelManager, bw: BufferedWriter) :
-    TrapWriter(loggerBase, lm, bw) {
+class DiagnosticTrapWriter(basicLogger: BasicLogger, lm: TrapLabelManager, bw: BufferedWriter) :
+    TrapWriter(basicLogger, lm, bw) {
     override fun getDiagnosticTrapWriter(): DiagnosticTrapWriter {
         return this
     }
@@ -313,13 +313,13 @@ OLD: KE1
  */
 */
 open class FileTrapWriter(
-    loggerBase: LoggerBase,
+    basicLogger: BasicLogger,
     lm: TrapLabelManager,
     bw: BufferedWriter,
     val dtw: DiagnosticTrapWriter,
     val filePath: String,
     populateFileTables: Boolean
-) : TrapWriter(loggerBase, lm, bw) {
+) : TrapWriter(basicLogger, lm, bw) {
 
     /** The ID for the file that we are extracting from. */
     val fileId = mkFileId(filePath, populateFileTables)
@@ -442,13 +442,13 @@ OLD: KE1
  */
 */
 class SourceFileTrapWriter(
-    loggerBase: LoggerBase,
+    basicLogger: BasicLogger,
     lm: TrapLabelManager,
     bw: BufferedWriter,
     dtw: DiagnosticTrapWriter,
     val ktFile: KtFile,
     populateFileTables: Boolean
-) : FileTrapWriter(loggerBase, lm, bw, dtw, ktFile.virtualFilePath, populateFileTables) {
+) : FileTrapWriter(basicLogger, lm, bw, dtw, ktFile.virtualFilePath, populateFileTables) {
 /*
 OLD: KE1
     /**
@@ -460,7 +460,7 @@ OLD: KE1
     override fun getLocation(startOffset: Int, endOffset: Int): Label<DbLocation> {
         if (startOffset == UNDEFINED_OFFSET || endOffset == UNDEFINED_OFFSET) {
             if (startOffset != endOffset) {
-                loggerBase.warn(
+                basicLogger.warn(
                     dtw,
                     "Location with inconsistent offsets (start $startOffset, end $endOffset)",
                     null
@@ -471,7 +471,7 @@ OLD: KE1
 
         if (startOffset == SYNTHETIC_OFFSET || endOffset == SYNTHETIC_OFFSET) {
             if (startOffset != endOffset) {
-                loggerBase.warn(
+                basicLogger.warn(
                     dtw,
                     "Location with inconsistent offsets (start $startOffset, end $endOffset)",
                     null
@@ -496,7 +496,7 @@ OLD: KE1
     override fun getLocationString(e: IrElement): String {
         if (e.startOffset == UNDEFINED_OFFSET || e.endOffset == UNDEFINED_OFFSET) {
             if (e.startOffset != e.endOffset) {
-                loggerBase.warn(
+                basicLogger.warn(
                     dtw,
                     "Location with inconsistent offsets (start ${e.startOffset}, end ${e.endOffset})",
                     null
@@ -507,7 +507,7 @@ OLD: KE1
 
         if (e.startOffset == SYNTHETIC_OFFSET || e.endOffset == SYNTHETIC_OFFSET) {
             if (e.startOffset != e.endOffset) {
-                loggerBase.warn(
+                basicLogger.warn(
                     dtw,
                     "Location with inconsistent offsets (start ${e.startOffset}, end ${e.endOffset})",
                     null