Kotlin: KotlinSourceFileExtractor: Take filePath rather than file

igfoo · igfoo · commit d43efd4cc791 · 2022-05-10T19:51:13.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -123,8 +123,8 @@ fun doFile(invocationTrapFile: String,
             // file information
             val sftw = tw.makeSourceFileTrapWriter(file, true)
             val externalClassExtractor = ExternalClassExtractor(logger, invocationTrapFile, file.path, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
-            val fileExtractor = KotlinSourceFileExtractor(logger, sftw, file, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
-            fileExtractor.extractFileContents(sftw.fileId)
+            val fileExtractor = KotlinSourceFileExtractor(logger, sftw, file.path, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
+            fileExtractor.extractFileContents(file, sftw.fileId)
             externalClassExtractor.extractExternalClasses()
         }
         if (checkTrapIdentical && trapFile.exists()) {
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt
@@ -2513,7 +2513,7 @@ open class KotlinFileExtractor(
             }
 
             if (parent is IrFile) {
-                if (this is KotlinSourceFileExtractor && this.file == parent) {
+                if (this is KotlinSourceFileExtractor && this.filePath == parent.path) {
                     val fileId = extractFileClass(parent)
                     tw.writeEnclInReftype(id, fileId)
                 } else {
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinSourceFileExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinSourceFileExtractor.kt
@@ -14,21 +14,21 @@ import org.jetbrains.kotlin.ir.util.IdSignature
 class KotlinSourceFileExtractor(
     logger: FileLogger,
     tw: FileTrapWriter,
-    val file: IrFile,
+    val filePath: String,
     externalClassExtractor: ExternalClassExtractor,
     primitiveTypeMapping: PrimitiveTypeMapping,
     pluginContext: IrPluginContext,
     genericSpecialisationsExtracted: MutableSet<String>
 ) :
   KotlinFileExtractor(logger, tw, null, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted) {
 
-    fun extractFileContents(id: Label<DbFile>) {
+    fun extractFileContents(file: IrFile, id: Label<DbFile>) {
         val locId = tw.getWholeFileLocation()
         val pkg = file.fqName.asString()
         val pkgId = extractPackage(pkg)
         tw.writeHasLocation(id, locId)
         tw.writeCupackage(id, pkgId)
         file.declarations.map { extractDeclaration(it) }
-        CommentExtractor(this).extract()
+        CommentExtractor(this, file).extract()
     }
 }
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt
@@ -125,13 +125,13 @@ open class KotlinUsesExtractor(
             return KotlinFileExtractor(newLogger, newTrapWriter, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
         }
 
-        if (this is KotlinSourceFileExtractor && this.file == clsFile) {
+        if (this is KotlinSourceFileExtractor && this.filePath == clsFile.path) {
             return this
         }
 
         val newTrapWriter = tw.makeSourceFileTrapWriter(clsFile, false)
         val newLogger = FileLogger(logger.logCounter, newTrapWriter)
-        return KotlinSourceFileExtractor(newLogger, newTrapWriter, clsFile, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
+        return KotlinSourceFileExtractor(newLogger, newTrapWriter, clsFile.path, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)
     }
 
     // The Kotlin compiler internal representation of Outer<T>.Inner<S>.InnerInner<R> is InnerInner<R, S, T>. This function returns just `R`.
diff --git a/java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt b/java/kotlin-extractor/src/main/kotlin/comments/CommentExtractor.kt
@@ -7,14 +7,14 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.path
+import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtVisitor
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-class CommentExtractor(private val fileExtractor: KotlinSourceFileExtractor) {
-    private val file = fileExtractor.file
+class CommentExtractor(private val fileExtractor: KotlinSourceFileExtractor, private val file: IrFile) {
     private val tw = fileExtractor.tw
     private val logger = fileExtractor.logger
     private val ktFile = Psi2Ir().getKtFile(file)

Original file line number	Diff line number	Diff line change
`@@ -2513,7 +2513,7 @@ open class KotlinFileExtractor(`
`2513`	`2513`	`}`
`2514`	`2514`
`2515`	`2515`	`if (parent is IrFile) {`
`2516`		`- if (this is KotlinSourceFileExtractor && this.file == parent) {`
	`2516`	`+ if (this is KotlinSourceFileExtractor && this.filePath == parent.path) {`
`2517`	`2517`	`val fileId = extractFileClass(parent)`
`2518`	`2518`	`tw.writeEnclInReftype(id, fileId)`
`2519`	`2519`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -125,13 +125,13 @@ open class KotlinUsesExtractor(`
`125`	`125`	`return KotlinFileExtractor(newLogger, newTrapWriter, dependencyCollector, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)`
`126`	`126`	`}`
`127`	`127`
`128`		`- if (this is KotlinSourceFileExtractor && this.file == clsFile) {`
	`128`	`+ if (this is KotlinSourceFileExtractor && this.filePath == clsFile.path) {`
`129`	`129`	`return this`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`val newTrapWriter = tw.makeSourceFileTrapWriter(clsFile, false)`
`133`	`133`	`val newLogger = FileLogger(logger.logCounter, newTrapWriter)`
`134`		`- return KotlinSourceFileExtractor(newLogger, newTrapWriter, clsFile, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)`
	`134`	`+ return KotlinSourceFileExtractor(newLogger, newTrapWriter, clsFile.path, externalClassExtractor, primitiveTypeMapping, pluginContext, genericSpecialisationsExtracted)`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	// The Kotlin compiler internal representation of Outer<T>.Inner<S>.InnerInner<R> is InnerInner<R, S, T>. This function returns just `R`.