From 0c2aedbb55e76fdc5edbac8540b4b26e14348ebb Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Thu, 26 Sep 2024 14:38:35 +0100
Subject: [PATCH] KE2: Remove the declaration stack for now

Lets see if we still need it in KE2, or if there's a simpler way.
---
 java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt   | 1 -
 .../src/main/kotlin/KotlinFileExtractor.kt                  | 3 +--
 java/kotlin-extractor2/src/main/kotlin/entities/Class.kt    | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
index a9da8c214af..c87f5d4d9c3 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractor.kt
@@ -554,7 +554,6 @@ private fun doFile(
             KotlinFileExtractor(
                 logger,
                 sftw,
-                KotlinFileExtractor.DeclarationStack()
                 /*
                 OLD: KE1
                                 linesOfCode,
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 9065e2548bd..54574a20ddf 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -87,7 +87,6 @@ context (KaSession)
 open class KotlinFileExtractor(
     override val logger: FileLogger,
     override val tw: FileTrapWriter,
-    val declarationStack: DeclarationStack,
     /*
     OLD: KE1
         val linesOfCode: LinesOfCode?,
@@ -8914,7 +8913,6 @@ OLD: KE1
             }
         }
 
-     */
     inner class DeclarationStackAdjuster(
         val declaration: KaDeclarationSymbol,
         val overriddenAttributes: OverriddenFunctionAttributes? = null
@@ -8944,6 +8942,7 @@ OLD: KE1
 
         fun findOverriddenAttributes(f: KaFunctionSymbol) = stack.lastOrNull { it.first == f }?.second
     }
+     */
 
     data class OverriddenFunctionAttributes(
         val id: Label<out DbCallable>? = null,
diff --git a/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt b/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
index 1949f819fe0..74d53b8d3c4 100644
--- a/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
@@ -23,7 +23,7 @@ fun KotlinFileExtractor.extractClassSource(
      */
 ): Label<out DbClassorinterface> {
     with("class source", c.psiSafe() ?: TODO()) {
-        DeclarationStackAdjuster(c).use {
+        // OLD: KE1: DeclarationStackAdjuster(c).use {
             val id = useClassSource(c)
             val pkg = c.classId?.packageFqName?.asString() ?: ""
             val cls =
@@ -182,7 +182,7 @@ fun KotlinFileExtractor.extractClassSource(
             */
 
             return id
-        }
+        // }
     }
 }
 
@@ -373,4 +373,4 @@ fun KotlinUsesExtractor.useType(t: KaType, context: TypeContext = TypeContext.OT
                 }
             }
     */
-}
\ No newline at end of file
+}