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

KotlinQuickDocumentationProvider: cleanup after J2K done

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-15 20:16:48 +02:00
parent a13e38578a
commit 0c6cd3b422
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+12 -16
View File
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetPsiUtil
import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.psi.JetReferenceExpression
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
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
@@ -61,23 +62,16 @@ public class KotlinQuickDocumentationProvider : AbstractDocumentationProvider()
return null return null
} }
val project = psiManager.getProject()
val cacheService = KotlinCacheService.getInstance(project)
val session = cacheService.getLazyResolveSession(context)
val bindingContext = context.analyze(BodyResolveMode.PARTIAL) val bindingContext = context.analyze(BodyResolveMode.PARTIAL)
val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, context] val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, context]
if (contextDescriptor == null) { if (contextDescriptor == null) {
return null return null
} }
val descriptors = resolveKDocLink(session, contextDescriptor, null, StringUtil.split(link, ",")) val descriptors = resolveKDocLink(context.getResolutionFacade(), contextDescriptor, null, StringUtil.split(link, ","))
if (!descriptors.isEmpty()) { val target = descriptors.firstOrNull()
val target = descriptors.iterator().next() if (target is DeclarationDescriptorWithSource) {
if (target is DeclarationDescriptorWithSource) { val source = target.getSource()
val source = target.getSource() return (source as? PsiSourceElement)?.psi
if (source is PsiSourceElement) {
return source.psi
}
}
} }
return null return null
} }
@@ -90,14 +84,16 @@ public class KotlinQuickDocumentationProvider : AbstractDocumentationProvider()
return renderKotlinDeclaration(element, quickNavigation) return renderKotlinDeclaration(element, quickNavigation)
} }
else if (element is KotlinLightMethod) { else if (element is KotlinLightMethod) {
return renderKotlinDeclaration(element.getOrigin(), quickNavigation) val origin = element.getOrigin()
if (origin == null) return null
return renderKotlinDeclaration(origin, quickNavigation)
} }
if (quickNavigation) { if (quickNavigation) {
val referenceExpression = PsiTreeUtil.getParentOfType<JetReferenceExpression>(originalElement, javaClass<JetReferenceExpression>(), false) val referenceExpression = originalElement.getNonStrictParentOfType<JetReferenceExpression>()
if (referenceExpression != null) { if (referenceExpression != null) {
val context = referenceExpression.analyze(BodyResolveMode.PARTIAL) val context = referenceExpression.analyze(BodyResolveMode.PARTIAL)
val declarationDescriptor = context.get<JetReferenceExpression, DeclarationDescriptor>(BindingContext.REFERENCE_TARGET, referenceExpression) val declarationDescriptor = context[BindingContext.REFERENCE_TARGET, referenceExpression]
if (declarationDescriptor != null) { if (declarationDescriptor != null) {
return mixKotlinToJava(declarationDescriptor, element, originalElement) return mixKotlinToJava(declarationDescriptor, element, originalElement)
} }
@@ -112,7 +108,7 @@ public class KotlinQuickDocumentationProvider : AbstractDocumentationProvider()
private fun renderKotlinDeclaration(declaration: JetDeclaration, quickNavigation: Boolean): String { private fun renderKotlinDeclaration(declaration: JetDeclaration, quickNavigation: Boolean): String {
val context = declaration.analyze(BodyResolveMode.PARTIAL) val context = declaration.analyze(BodyResolveMode.PARTIAL)
val declarationDescriptor = context.get<PsiElement, DeclarationDescriptor>(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration) val declarationDescriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration]
if (declarationDescriptor == null) { if (declarationDescriptor == null) {
LOG.info("Failed to find descriptor for declaration " + JetPsiUtil.getElementTextWithContext(declaration)) LOG.info("Failed to find descriptor for declaration " + JetPsiUtil.getElementTextWithContext(declaration))