azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix module qualified names

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-08-26 16:05:08 +03:00
parent 9338a3c086
commit 5ef4a01a45
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
+6 -4
View File
@@ -16,12 +16,14 @@ import javax.xml.parsers.DocumentBuilderFactory
data class ModuleData( data class ModuleData(
val name: String, val name: String,
val outputDir: String, val outputDir: String,
val qualifiedName: String, val qualifier: String,
val classpath: List<File>, val classpath: List<File>,
val sources: List<File>, val sources: List<File>,
val javaSourceRoots: List<File>, val javaSourceRoots: List<File>,
val isCommon: Boolean val isCommon: Boolean
) ) {
val qualifiedName get() = if (name in qualifier) qualifier else "$name.$qualifier"
}
private fun NodeList.toList(): List<Node> { private fun NodeList.toList(): List<Node> {
val list = mutableListOf<Node>() val list = mutableListOf<Node>()
@@ -55,7 +57,7 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() {
val moduleElement = document.childNodes.item(0).childNodesList.first { it.nodeType == Node.ELEMENT_NODE } val moduleElement = document.childNodes.item(0).childNodesList.first { it.nodeType == Node.ELEMENT_NODE }
val moduleName = moduleElement.attributes.getNamedItem("name").nodeValue val moduleName = moduleElement.attributes.getNamedItem("name").nodeValue
val outputDir = moduleElement.attributes.getNamedItem("outputDir").nodeValue val outputDir = moduleElement.attributes.getNamedItem("outputDir").nodeValue
val qualifiedModuleName = outputDir.substringAfterLast("/") val moduleNameQualifier = outputDir.substringAfterLast("/")
val javaSourceRoots = mutableListOf<File>() val javaSourceRoots = mutableListOf<File>()
val classpath = mutableListOf<File>() val classpath = mutableListOf<File>()
val sources = mutableListOf<File>() val sources = mutableListOf<File>()
@@ -81,7 +83,7 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() {
} }
} }
return ModuleData(moduleName, outputDir, qualifiedModuleName, classpath, sources, javaSourceRoots, isCommon) return ModuleData(moduleName, outputDir, moduleNameQualifier, classpath, sources, javaSourceRoots, isCommon)
} }
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+3 -2
View File
@@ -89,10 +89,11 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
private val dumpedModules = mutableSetOf<String>() private val dumpedModules = mutableSetOf<String>()
private fun ModuleData.disambiguatedName(): String { private fun ModuleData.disambiguatedName(): String {
var disambiguatedName = this.name val baseName = qualifiedName
var disambiguatedName = baseName
var counter = 0 var counter = 0
while(!dumpedModules.add(disambiguatedName)) { while(!dumpedModules.add(disambiguatedName)) {
disambiguatedName = "${this.name}.${counter++}" disambiguatedName = "$baseName.${counter++}"
} }
return disambiguatedName return disambiguatedName
} }