Add toString() to Any, fix all tests

#KT-4517 Fixed
This commit is contained in:
Alexander Udalov
2014-02-06 23:43:12 +04:00
parent 6127d53eac
commit 3dcd85bdb4
55 changed files with 110 additions and 72 deletions
@@ -934,7 +934,7 @@ abstract class KNamed(val name: String, model: KModel, declarationDescriptor: De
open fun equals(other: KPackage) = name == other.name
open fun toString() = name
override fun toString() = name
}
@@ -957,7 +957,7 @@ class KPackage(model: KModel, val descriptor: PackageFragmentDescriptor,
fun equals(other: KPackage) = name == other.name
fun toString() = "KPackage($name)"
override fun toString() = "KPackage($name)"
fun getClass(descriptor: ClassDescriptor): KClass {
val name = descriptor.getName().asString()
@@ -1089,7 +1089,7 @@ class KClass(
fun equals(other: KClass) = name == other.name
fun toString() = "$kind($name)"
override fun toString() = "$kind($name)"
fun isApi(): Boolean {
val visibility = descriptor.getVisibility()
@@ -1185,7 +1185,7 @@ class KFunction(val descriptor: CallableDescriptor, val owner: KClassOrPackage,
fun equals(other: KFunction) = name == other.name && this.parameterTypeText == other.parameterTypeText &&
this.extensionClass == other.extensionClass && this.owner == other.owner
fun toString() = "fun $name($parameterTypeText): $returnType"
override fun toString() = "fun $name($parameterTypeText): $returnType"
public val link: String = "$name($parameterTypeText)"
@@ -1212,13 +1212,13 @@ class KProperty(val owner: KClassOrPackage, val descriptor: PropertyDescriptor,
return visibility.isPublicAPI()
}
fun toString() = "property $name"
override fun toString() = "property $name"
}
class KParameter(val descriptor: ValueParameterDescriptor, val name: String,
var aType: KType): KAnnotated(aType.model, aType.declarationDescriptor) {
fun toString() = "$name: ${aType.name}"
override fun toString() = "$name: ${aType.name}"
fun isVarArg(): Boolean = descriptor.getVarargElementType() != null
@@ -1237,12 +1237,12 @@ class KTypeParameter(val name: String,
model: KModel,
var extends: List<KClass> = arrayList<KClass>()): KAnnotated(model, descriptor) {
fun toString() = "$name"
override fun toString() = "$name"
}
class KAnnotation(var klass: KClass): KAnnotated(klass.model, klass.descriptor) {
// TODO add some parameter values?
fun toString() = "@$klass.simpleName"
override fun toString() = "@$klass.simpleName"
}
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.doc.model.*
class SearchXmlTemplate(val model: KModel): KDocTemplate() {
class Search(val name: String, val href: String, val kind: String) {
fun toString() = "Search($name, $href, $kind)"
override fun toString() = "Search($name, $href, $kind)"
}
override fun render() {
@@ -2,7 +2,7 @@ package sample
/** A Comment */
public class Person(val name: String, val city: String) {
fun toString(): String = "Person($name, $city)"
override fun toString(): String = "Person($name, $city)"
public fun hello(): String = "Hello $name"
}