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

use navigation element to resolve KDoc links, so that we have correct context when resolving links in the documentation of library elements

Browse Source 
#KT-10654 Fixed
This commit is contained in:
Dmitry Jemerov
2016-07-06 18:17:11 +02:00
parent fac1b85d26
commit 80e10c6928
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+4 -7
View File
@@ -53,13 +53,10 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
} }
override fun getDocumentationElementForLink(psiManager: PsiManager, link: String, context: PsiElement?): PsiElement? { override fun getDocumentationElementForLink(psiManager: PsiManager, link: String, context: PsiElement?): PsiElement? {
if (context !is KtElement) { val navElement = context?.navigationElement as? KtElement ?: return null
return null val bindingContext = navElement.analyze(BodyResolveMode.PARTIAL)
} val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, navElement] ?: return null
val descriptors = resolveKDocLink(bindingContext, navElement.getResolutionFacade(),
val bindingContext = context.analyze(BodyResolveMode.PARTIAL)
val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, context] ?: return null
val descriptors = resolveKDocLink(bindingContext, context.getResolutionFacade(),
contextDescriptor, null, StringUtil.split(link, ",")) contextDescriptor, null, StringUtil.split(link, ","))
val target = descriptors.firstOrNull() ?: return null val target = descriptors.firstOrNull() ?: return null
return DescriptorToSourceUtilsIde.getAnyDeclaration(psiManager.project, target) return DescriptorToSourceUtilsIde.getAnyDeclaration(psiManager.project, target)