From 6168541bd5bb141c40a1e2a909afa84441b35ed5 Mon Sep 17 00:00:00 2001 From: Ilya Ryzhenkov Date: Sat, 12 Jul 2014 18:29:20 +0400 Subject: Support enums in model --- src/Model/Diagnostics.kt | 4 ++-- src/Model/DocumentationNode.kt | 2 ++ src/Model/DocumentationNodeBuilder.kt | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Model') diff --git a/src/Model/Diagnostics.kt b/src/Model/Diagnostics.kt index 899ff7de..a464107f 100644 --- a/src/Model/Diagnostics.kt +++ b/src/Model/Diagnostics.kt @@ -12,8 +12,8 @@ fun BindingContext.checkResolveChildren(node : DocumentationNode) { for (item in node.details + node.members) { val symbolName = item.name val symbol: DeclarationDescriptor? = when (item.kind) { - DocumentationNode.Kind.Modifier -> continue // do not resolve modifiers - DocumentationNode.Kind.Receiver -> (parentScope.getContainingDeclaration() as CallableDescriptor).getReceiverParameter() + DocumentationNode.Kind.Modifier -> continue // do not resolve modifiers, they are not names + DocumentationNode.Kind.Receiver -> continue // what is receiver's name in platform? DocumentationNode.Kind.Parameter -> parentScope.getLocalVariable(Name.guess(symbolName)) DocumentationNode.Kind.Function -> parentScope.getFunctions(Name.guess(symbolName)).firstOrNull() DocumentationNode.Kind.Property -> parentScope.getProperties(Name.guess(symbolName)).firstOrNull() diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index ccfb9b7d..8132c419 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -50,6 +50,8 @@ public open class DocumentationNode(val descriptor: DeclarationDescriptor, Package Class Interface + Enum + EnumItem Object Constructor diff --git a/src/Model/DocumentationNodeBuilder.kt b/src/Model/DocumentationNodeBuilder.kt index 1f553f33..f974ab11 100644 --- a/src/Model/DocumentationNodeBuilder.kt +++ b/src/Model/DocumentationNodeBuilder.kt @@ -61,7 +61,10 @@ class DocumentationNodeBuilder(val context: BindingContext) : DeclarationDescrip val doc = context.getDocumentation(descriptor!!) val node = DocumentationNode(descriptor, descriptor.getName().asString(), doc, when (descriptor.getKind()) { ClassKind.OBJECT -> DocumentationNode.Kind.Object + ClassKind.CLASS_OBJECT -> DocumentationNode.Kind.Object ClassKind.TRAIT -> DocumentationNode.Kind.Interface + ClassKind.ENUM_CLASS -> DocumentationNode.Kind.Enum + ClassKind.ENUM_ENTRY -> DocumentationNode.Kind.EnumItem else -> DocumentationNode.Kind.Class }) reference(data!!, node, DocumentationReference.Kind.Member) -- cgit