From e46e5e4cd8c4fd429160f00cae9a69a643c1d81e Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Thu, 29 Aug 2024 12:17:45 +0100
Subject: [PATCH] KE2: Start on KotlinFileExtractor

---
 .../kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt | 6 ++++++
 .../src/main/kotlin/KotlinFileExtractor.kt               | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
index 874045ae995..add9ab25131 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
@@ -528,8 +528,11 @@ OLD: KE1
                 fileDiagnosticTrapWriter.getDiagnosticTrapWriter()
             )
         val linesOfCode = LinesOfCode(logger, sftw, srcFile)
+*/
         val fileExtractor =
             KotlinFileExtractor(
+/*
+OLD: KE1
                 logger,
                 sftw,
                 linesOfCode,
@@ -540,8 +543,11 @@ OLD: KE1
                 pluginContext,
                 KotlinFileExtractor.DeclarationStack(),
                 globalExtensionState
+*/
             )
 
+/*
+OLD: KE1
         fileExtractor.extractFileContents(srcFile, sftw.fileId)
         externalDeclExtractor.extractExternalClasses()
 */
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 979ad6f6872..e0e22796387 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -68,8 +68,11 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.util.OperatorNameConventions
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
+*/
 
 open class KotlinFileExtractor(
+/*
+OLD: KE1
     override val logger: FileLogger,
     override val tw: FileTrapWriter,
     val linesOfCode: LinesOfCode?,
@@ -80,6 +83,10 @@ open class KotlinFileExtractor(
     pluginContext: IrPluginContext,
     val declarationStack: DeclarationStack,
     globalExtensionState: KotlinExtractorGlobalState,
+*/
+) {
+/*
+OLD: KE1
 ) :
     KotlinUsesExtractor(
         logger,
@@ -9209,5 +9216,5 @@ open class KotlinFileExtractor(
         ENUM_CONSTRUCTOR_ARGUMENT(12),
         CALLABLE_CLASS(13),
     }
-}
 */
+}