Better search for inlined strings in strata: there might me several file mappings to the same file (KT-12896)

#KT-12896 In Progress
This commit is contained in:
Nikolay Krasko
2016-08-01 15:51:59 +03:00
parent ace58e8aa2
commit 2dd7470cdc
12 changed files with 128 additions and 2 deletions
@@ -81,8 +81,8 @@ private fun inlinedLinesNumbers(
val smap = smapData.kotlinStrata ?: return listOf()
val mappingToInlinedFile = smap.fileMappings.firstOrNull() { it.name == inlineFileName } ?: return listOf()
return mappingToInlinedFile.lineMappings.map { it.mapSourceToDest(inlineLineNumber) }
val mappingsToInlinedFile = smap.fileMappings.filter() { it.name == inlineFileName }
return mappingsToInlinedFile.flatMap { it.lineMappings.map { it.mapSourceToDest(inlineLineNumber) } }
}
@Volatile var emulateDexDebugInTests: Boolean = false