From 90a73582ee840fc8c01adf24fa6e256a0dc8e17e Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igfoo@github.com>
Date: Thu, 29 Aug 2024 16:03:42 +0100
Subject: [PATCH] KE2: Extract package info

---
 java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt | 4 ++--
 java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 7333b800ecc..dcfb32ab1f7 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -150,12 +150,12 @@ OLD: KE1
         with("file", file) {
             val locId = tw.getWholeFileLocation()
             val pkg = file.packageFqName.asString()
-/*
-OLD: KE1
             val pkgId = extractPackage(pkg)
             tw.writeHasLocation(id, locId)
             tw.writeCupackage(id, pkgId)
 
+/*
+OLD: KE1
             val exceptionOnFile =
                 System.getenv("CODEQL_KOTLIN_INTERNAL_EXCEPTION_WHILE_EXTRACTING_FILE")
             if (exceptionOnFile != null) {
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
index af46c2174ad..b437eead955 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
@@ -60,6 +60,7 @@ OLD: KE1
     private fun usePackage(pkg: String): Label<out DbPackage> {
         return extractPackage(pkg)
     }
+*/
 
     fun extractPackage(pkg: String): Label<out DbPackage> {
         val pkgLabel = "@\"package;$pkg\""
@@ -67,6 +68,8 @@ OLD: KE1
         return id
     }
 
+/*
+OLD: KE1
     fun useFileClassType(f: IrFile) =
         TypeResults(TypeResult(extractFileClass(f), "", ""), TypeResult(fakeKotlinType(), "", ""))