From f9f766c508cceb1451affe39458ab924e9b9c2a5 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Thu, 29 Aug 2024 16:00:22 +0100
Subject: [PATCH] KE2: Start turning KotlinUsesExtractor back on

---
 .../src/main/kotlin/KotlinFileExtractor.kt        | 15 ++++++++++-----
 .../src/main/kotlin/KotlinUsesExtractor.kt        | 11 ++++++++++-
 .../src/main/kotlin/TrapWriter.kt                 |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 8b11e0aedf6..7333b800ecc 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -78,7 +78,7 @@ open class KotlinFileExtractor(
 OLD: KE1
     override val logger: FileLogger,
 */
-    /* TODO override */ val tw: FileTrapWriter,
+    override val tw: FileTrapWriter,
 /*
 OLD: KE1
     val linesOfCode: LinesOfCode?,
@@ -90,20 +90,25 @@ OLD: KE1
     val declarationStack: DeclarationStack,
     globalExtensionState: KotlinExtractorGlobalState,
 */
-) {
-/*
-OLD: KE1
 ) :
     KotlinUsesExtractor(
+/*
+OLD: KE1
         logger,
+*/
         tw,
+/*
+OLD: KE1
         dependencyCollector,
         externalClassExtractor,
         primitiveTypeMapping,
         pluginContext,
         globalExtensionState
+*/
     ) {
 
+/*
+OLD: KE1
     val usesK2 = usesK2(pluginContext)
     val metaAnnotationSupport = MetaAnnotationSupport(logger, pluginContext, this)
 */
@@ -144,9 +149,9 @@ OLD: KE1
     fun extractFileContents(file: KtFile, id: Label<DbFile>) {
         with("file", file) {
             val locId = tw.getWholeFileLocation()
+            val pkg = file.packageFqName.asString()
 /*
 OLD: KE1
-            val pkg = file.packageFqName.asString()
             val pkgId = extractPackage(pkg)
             tw.writeHasLocation(id, locId)
             tw.writeCupackage(id, pkgId)
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
index 9d91bd02aac..af46c2174ad 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
@@ -28,16 +28,25 @@ import org.jetbrains.kotlin.name.NameUtils
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.OperatorNameConventions
+*/
 
 open class KotlinUsesExtractor(
+/*
+OLD: KE1
     open val logger: Logger,
+*/
     open val tw: TrapWriter,
+/*
+OLD: KE1
     val dependencyCollector: OdasaOutput.TrapFileManager?,
     val externalClassExtractor: ExternalDeclExtractor,
     val primitiveTypeMapping: PrimitiveTypeMapping,
     val pluginContext: IrPluginContext,
     val globalExtensionState: KotlinExtractorGlobalState
+*/
 ) {
+/*
+OLD: KE1
     fun referenceExternalClass(name: String) =
         getClassByFqName(pluginContext, FqName(name))?.owner.also {
             if (it == null) logger.warn("Unable to resolve external class $name")
@@ -2250,5 +2259,5 @@ open class KotlinUsesExtractor(
     fun useVariable(v: IrVariable): Label<out DbLocalvar> {
         return tw.getVariableLabelFor<DbLocalvar>(v)
     }
-}
 */
+}
diff --git a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
index 1d1c4d64e7e..a43aad63caa 100644
--- a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
@@ -168,7 +168,7 @@ OLD: KE1
      * is lazy, as we don't want to define it in a TRAP file unless the TRAP file actually contains
      * something in the 'unknown' file.
      */
-    protected val unknownFileId: Label<DbFile> by lazy {
+    private val unknownFileId: Label<DbFile> by lazy {
         val unknownFileLabel = "@\";sourcefile\""
         getLabelFor(unknownFileLabel, { writeFiles(it, "") })
     }