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

attempt to fix compile error introduced by Stepan's refactoring

Browse Source
This commit is contained in:
James Strachan
2012-05-23 09:30:03 +01:00
parent a4991534b4
commit 53a9fff0bc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt
+6 -6
View File
@@ -67,7 +67,7 @@ fun qualifiedName(descriptor: DeclarationDescriptor?): String {
return "" return ""
} else { } else {
val parent = containerName(descriptor) val parent = containerName(descriptor)
var name = descriptor.getName() ?: "" var name = descriptor.getName()?.getName() ?: ""
if (name.startsWith("<")) { if (name.startsWith("<")) {
name = "" name = ""
} }
@@ -356,7 +356,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
val descriptors = scope.getAllDescriptors() val descriptors = scope.getAllDescriptors()
for (descriptor in descriptors) { for (descriptor in descriptors) {
if (descriptor is PropertyDescriptor) { if (descriptor is PropertyDescriptor) {
val name = descriptor.getName() val name = descriptor.getName()?.getName()
val returnType = getType(descriptor.getReturnType()) val returnType = getType(descriptor.getReturnType())
if (returnType != null) { if (returnType != null) {
val receiver = descriptor.getReceiverParameter() val receiver = descriptor.getReceiverParameter()
@@ -384,7 +384,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
protected fun createFunction(owner: KClassOrPackage, descriptor: CallableDescriptor): KFunction? { protected fun createFunction(owner: KClassOrPackage, descriptor: CallableDescriptor): KFunction? {
val returnType = getType(descriptor.getReturnType()) val returnType = getType(descriptor.getReturnType())
if (returnType != null) { if (returnType != null) {
val name = descriptor.getName() ?: "null" val name = descriptor.getName()?.getName() ?: "null"
val parameters = ArrayList<KParameter>() val parameters = ArrayList<KParameter>()
val params = descriptor.getValueParameters() val params = descriptor.getValueParameters()
for (param in params) { for (param in params) {
@@ -421,7 +421,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
} }
protected fun createTypeParameter(descriptor: TypeParameterDescriptor): KTypeParameter? { protected fun createTypeParameter(descriptor: TypeParameterDescriptor): KTypeParameter? {
val name = descriptor.getName() val name = descriptor.getName()?.getName()
val answer = KTypeParameter(name, descriptor, this) val answer = KTypeParameter(name, descriptor, this)
configureComments(answer, descriptor) configureComments(answer, descriptor)
return answer return answer
@@ -430,7 +430,7 @@ class KModel(var context: BindingContext, val config: KDocConfig) {
protected fun createParameter(descriptor: ValueParameterDescriptor): KParameter? { protected fun createParameter(descriptor: ValueParameterDescriptor): KParameter? {
val returnType = getType(descriptor.getReturnType()) val returnType = getType(descriptor.getReturnType())
if (returnType != null) { if (returnType != null) {
val name = descriptor.getName() val name = descriptor.getName()?.getName()
val answer = KParameter(descriptor, name, returnType) val answer = KParameter(descriptor, name, returnType)
configureComments(answer, descriptor) configureComments(answer, descriptor)
return answer return answer
@@ -681,7 +681,7 @@ $highlight"""
} }
fun getClass(classElement: ClassDescriptor): KClass? { fun getClass(classElement: ClassDescriptor): KClass? {
val name = classElement.getName() val name = classElement.getName()?.getName()
if (name != null) { if (name != null) {
var dec: DeclarationDescriptor? = classElement.getContainingDeclaration() var dec: DeclarationDescriptor? = classElement.getContainingDeclaration()
while (dec != null) { while (dec != null) {