Merge pull request github#11130 from smowton/smowton/fix/kotlin-always-extract-file-labels

smowton · web-flow · commit 68face8d463c · 2022-11-07T10:14:41.000Z
Kotlin: always populate the `files` table
diff --git a/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt b/java/kotlin-extractor/src/main/kotlin/ExternalDeclExtractor.kt
@@ -80,7 +80,7 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri
                                     }
                                     // Now elevate to a SourceFileTrapWriter, and populate the
                                     // file information if needed:
-                                    val ftw = tw.makeFileTrapWriter(binaryPath, irDecl is IrClass)
+                                    val ftw = tw.makeFileTrapWriter(binaryPath, true)
 
                                     val fileExtractor = KotlinFileExtractor(logger, ftw, null, binaryPath, manager, this, primitiveTypeMapping, pluginContext, KotlinFileExtractor.DeclarationStack(), globalExtensionState)
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ class ExternalDeclExtractor(val logger: FileLogger, val invocationTrapFile: Stri`
`80`	`80`	`}`
`81`	`81`	`// Now elevate to a SourceFileTrapWriter, and populate the`
`82`	`82`	`// file information if needed:`
`83`		`- val ftw = tw.makeFileTrapWriter(binaryPath, irDecl is IrClass)`
	`83`	`+ val ftw = tw.makeFileTrapWriter(binaryPath, true)`
`84`	`84`
`85`	`85`	`val fileExtractor = KotlinFileExtractor(logger, ftw, null, binaryPath, manager, this, primitiveTypeMapping, pluginContext, KotlinFileExtractor.DeclarationStack(), globalExtensionState)`
`86`	`86`