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

fix functions with no arguments appearing correctly in kdoc

Browse Source
This commit is contained in:
James Strachan
2012-03-01 15:21:10 +00:00
parent 6315c03ea8
commit 9dfd5da850
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
Vendored
+4 -4
View File
@@ -77,12 +77,12 @@ abstract class KDocTemplate() : TextTemplate() {
val rt = arguments.last() val rt = arguments.last()
// TODO use drop() // TODO use drop()
val rest = arguments.subList(0, arguments.size - 1).notNull() val rest = arguments.subList(0, arguments.size - 1).notNull()
"${typeArguments(rest, "(", ")")}&nbsp;<A HREF=\"${href(c)}\" title=\"${c.kind} in ${c.packageName}\">-&gt;</a>&nbsp;${link(rt)}" "${typeArguments(rest, "(", ")", "()")}&nbsp;<A HREF=\"${href(c)}\" title=\"${c.kind} in ${c.packageName}\">-&gt;</a>&nbsp;${link(rt)}"
} else if (c.name.startsWith("jet.Tuple")) { } else if (c.name.startsWith("jet.Tuple")) {
if (arguments.isEmpty()) { if (arguments.isEmpty()) {
"Unit" "Unit"
} else { } else {
"<A HREF=\"${href(c)}\" title=\"${c.kind} in ${c.packageName}\">#</a>${typeArguments(arguments, "(", ")")}" "<A HREF=\"${href(c)}\" title=\"${c.kind} in ${c.packageName}\">#</a>${typeArguments(arguments, "(", ")", "()")}"
} }
} else { } else {
val name = if (fullName) c.name else c.simpleName val name = if (fullName) c.name else c.simpleName
@@ -93,9 +93,9 @@ abstract class KDocTemplate() : TextTemplate() {
} }
} }
open fun typeArguments(arguments: List<KType>, val prefix: String = "&lt;", val postfix: String = "&gt;"): String { open fun typeArguments(arguments: List<KType>, val prefix: String = "&lt;", val postfix: String = "&gt;", val empty: String = ""): String {
val text = arguments.map<KType, String>() { link(it) }.join(", ") val text = arguments.map<KType, String>() { link(it) }.join(", ")
return if (text.length() == 0) "" else "$prefix$text$postfix" return if (text.length() == 0) empty else "$prefix$text$postfix"
} }
open fun link(p: KPackage): String { open fun link(p: KPackage): String {