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

use a better API for locating target element when navigating by documentation link, to ensure we find the source for descriptors belonging to library classes

Browse Source 
#KT-12932 Fixed
This commit is contained in:
Dmitry Jemerov
2016-07-06 18:09:00 +02:00
parent 88fe6680fa
commit fac1b85d26
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+3 -8
View File
@@ -24,10 +24,10 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiManager import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.asJava.KtLightDeclaration import org.jetbrains.kotlin.asJava.KtLightDeclaration
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
import org.jetbrains.kotlin.idea.kdoc.KDocRenderer import org.jetbrains.kotlin.idea.kdoc.KDocRenderer
import org.jetbrains.kotlin.idea.kdoc.findKDoc import org.jetbrains.kotlin.idea.kdoc.findKDoc
@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.source.PsiSourceElement
import org.jetbrains.kotlin.utils.addToStdlib.constant import org.jetbrains.kotlin.utils.addToStdlib.constant
class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
@@ -62,12 +61,8 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, context] ?: return null val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, context] ?: return null
val descriptors = resolveKDocLink(bindingContext, context.getResolutionFacade(), val descriptors = resolveKDocLink(bindingContext, context.getResolutionFacade(),
contextDescriptor, null, StringUtil.split(link, ",")) contextDescriptor, null, StringUtil.split(link, ","))
val target = descriptors.firstOrNull() val target = descriptors.firstOrNull() ?: return null
if (target is DeclarationDescriptorWithSource) { return DescriptorToSourceUtilsIde.getAnyDeclaration(psiManager.project, target)
val source = target.source
return (source as? PsiSourceElement)?.psi
}
return null
} }
override fun getDocumentationElementForLookupItem(psiManager: PsiManager, `object`: Any?, element: PsiElement?): PsiElement? { override fun getDocumentationElementForLookupItem(psiManager: PsiManager, `object`: Any?, element: PsiElement?): PsiElement? {