diff options
author | Ilya Ryzhenkov <orangy@jetbrains.com> | 2014-07-12 01:18:28 +0400 |
---|---|---|
committer | Ilya Ryzhenkov <orangy@jetbrains.com> | 2014-07-12 01:18:28 +0400 |
commit | a5999ec90d77e6fe1f8ce292e0b570588eba9f73 (patch) | |
tree | 3b4105096bb4f6e2446c18caa6017ed6ab831ba9 | |
parent | 2878f900d17625dd13944424d8ddf55f7eb03ac4 (diff) | |
download | dokka-a5999ec90d77e6fe1f8ce292e0b570588eba9f73.tar.gz dokka-a5999ec90d77e6fe1f8ce292e0b570588eba9f73.tar.bz2 dokka-a5999ec90d77e6fe1f8ce292e0b570588eba9f73.zip |
Do not resolve during model building, instead save scopes and do it later.
-rw-r--r-- | src/Model/DocumentationBuildingVisitor.kt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Model/DocumentationBuildingVisitor.kt b/src/Model/DocumentationBuildingVisitor.kt index b078f753..c21e8f7a 100644 --- a/src/Model/DocumentationBuildingVisitor.kt +++ b/src/Model/DocumentationBuildingVisitor.kt @@ -28,19 +28,19 @@ class DocumentationBuildingVisitor(val context: BindingContext, private val work visitChildren(descriptor.getTypeParameters(), node) visitChild(descriptor.getReceiverParameter(), node) visitChildren(descriptor.getValueParameters(), node) - return node.resolve() + return node } public override fun visitPackageFragmentDescriptor(descriptor: PackageFragmentDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = createDocumentation(descriptor!!, data!!) visitChildren(descriptor.getMemberScope().getAllDescriptors(), node) - return node.resolve() + return node } public override fun visitPackageViewDescriptor(descriptor: PackageViewDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = createDocumentation(descriptor!!, data!!) visitChildren(descriptor.getMemberScope().getAllDescriptors(), node) - return node.resolve() + return node } public override fun visitVariableDescriptor(descriptor: VariableDescriptor?, data: DocumentationNode?): DocumentationNode? { @@ -57,12 +57,12 @@ class DocumentationBuildingVisitor(val context: BindingContext, private val work public override fun visitFunctionDescriptor(descriptor: FunctionDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = processCallable(descriptor!!, data!!) - return node.resolve() + return node } public override fun visitTypeParameterDescriptor(descriptor: TypeParameterDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = createDocumentation(descriptor!!, data!!) - return node.resolve() + return node } public override fun visitClassDescriptor(descriptor: ClassDescriptor?, data: DocumentationNode?): DocumentationNode? { @@ -77,43 +77,43 @@ class DocumentationBuildingVisitor(val context: BindingContext, private val work it !is CallableMemberDescriptor || it.isUserCode() } visitChildren(members, node) - return node.resolve() + return node } public override fun visitModuleDeclaration(descriptor: ModuleDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = createDocumentation(descriptor!!, data!!) visitChild(descriptor.getPackage(FqName.ROOT), node) - return node.resolve() + return node } public override fun visitConstructorDescriptor(descriptor: ConstructorDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = visitFunctionDescriptor(descriptor!!, data) - return node?.resolve() + return node } public override fun visitScriptDescriptor(scriptDescriptor: ScriptDescriptor?, data: DocumentationNode?): DocumentationNode? { val classDescriptor = scriptDescriptor!!.getClassDescriptor() val node = visitClassDescriptor(classDescriptor, data) - return node?.resolve() + return node } public override fun visitValueParameterDescriptor(descriptor: ValueParameterDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = visitVariableDescriptor(descriptor!!, data) - return node?.resolve() + return node } public override fun visitPropertyGetterDescriptor(descriptor: PropertyGetterDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = visitFunctionDescriptor(descriptor!!, data) - return node?.resolve() + return node } public override fun visitPropertySetterDescriptor(descriptor: PropertySetterDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = visitFunctionDescriptor(descriptor!!, data) - return node?.resolve() + return node } public override fun visitReceiverParameterDescriptor(descriptor: ReceiverParameterDescriptor?, data: DocumentationNode?): DocumentationNode? { val node = createDocumentation(descriptor!!, data!!) - return node.resolve() + return node } } |