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

[klib] Print package fq-name

Browse Source
This commit is contained in:
Ilya Matveev
2018-02-12 17:45:30 +07:00
committed by ilmat192
parent f156c4a368
commit 07b2ff3c18
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/PrettyPrinter.kt
+15 -8
View File
@@ -118,21 +118,29 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
get() = !isEnumEntry && !classId.let { it.isLocal || it.isNestedClass } get() = !isEnumEntry && !classId.let { it.isLocal || it.isNestedClass }
fun print() { fun print() {
if (packageFragment.isEmpty) {
return
}
TypeTables.push(packageFragment.`package`.typeTable) TypeTables.push(packageFragment.`package`.typeTable)
// if (packageFragment.hasFqName()) printer.print("package ${packageFragment.fqName}\n") if (packageFragment.hasFqName()) printer.print("package ${packageFragment.fqName}")
packageFragment.classes.classesList.forEach {if (it.isTopLevel) printer.println(it.asString()) } val packageBody = StringBuilder().buildBody {
packageFragment.`package`.functionList.forEach { printer.println(it.asString()) } packageFragment.classes.classesList.forEach {if (it.isTopLevel) appendln(it.asString()) }
packageFragment.`package`.propertyList.forEach { printer.println(it.asString()) } packageFragment.`package`.functionList.forEach { appendln(it.asString()) }
packageFragment.`package`.propertyList.forEach { appendln(it.asString()) }
}
printer.print(packageBody.toString())
TypeTables.pop() TypeTables.pop()
} }
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
private fun StringBuilder.buildBody(body: StringBuilder.() -> Unit) { private fun StringBuilder.buildBody(body: StringBuilder.() -> Unit): StringBuilder {
Indent.push() Indent.push()
val result = StringBuilder().apply(body).toString() val result = StringBuilder().apply(body).toString()
Indent.pop() Indent.pop()
append(if (result.isEmpty()) "\n" else " {\n$result$Indent}\n") append(if (result.isEmpty()) "\n" else " {\n$result$Indent}\n")
return this
} }
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
@@ -295,9 +303,8 @@ class PackageFragmentPrinter(val packageFragment: KonanLinkData.PackageFragment,
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//
private fun annotationsToString(annotations: List<ProtoBuf.Annotation>, separator: String = " "): String { private fun annotationsToString(annotations: List<ProtoBuf.Annotation>, separator: String = " ") =
return buildString { annotations.forEach { append(it.asString() + separator) } } buildString { annotations.forEach { append(it.asString() + separator) } }
}
//-------------------------------------------------------------------------// //-------------------------------------------------------------------------//