diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt index 2a8863a0e68..150138d2e44 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt @@ -139,8 +139,10 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { val navElement = context?.navigationElement as? KtElement ?: return null val bindingContext = navElement.analyze(BodyResolveMode.PARTIAL) val contextDescriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, navElement] ?: return null - val descriptors = resolveKDocLink(bindingContext, navElement.getResolutionFacade(), - contextDescriptor, null, link.split('.')) + val descriptors = resolveKDocLink( + bindingContext, navElement.getResolutionFacade(), + contextDescriptor, null, link.split('.') + ) val target = descriptors.firstOrNull() ?: return null return DescriptorToSourceUtilsIde.getAnyDeclaration(psiManager.project, target) } @@ -173,7 +175,7 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { val enumDescriptor = declarationDescriptor?.getSuperClassNotAny() ?: return renderedDecl val enumDeclaration = - DescriptorToSourceUtilsIde.getAnyDeclaration(element.project, enumDescriptor) as? KtDeclaration ?: return renderedDecl + DescriptorToSourceUtilsIde.getAnyDeclaration(element.project, enumDescriptor) as? KtDeclaration ?: return renderedDecl val enumSource = SourceNavigationHelper.getNavigationElement(enumDeclaration) val functionName = functionDescriptor.fqNameSafe.shortName().asString() @@ -185,8 +187,7 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() { val renderedComment = KDocRenderer.renderKDoc(kdoc.getDefaultSection()) if (renderedComment.startsWith("
")) {
renderedDecl += renderedComment
- }
- else {
+ } else {
renderedDecl = "$renderedDecl
$renderedComment"
}
}
@@ -201,8 +202,8 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
// element is not an KtReferenceExpression, but KtClass of enum
// so reference extracted from originalElement
val context = referenceExpression.analyze(BodyResolveMode.PARTIAL)
- (context[BindingContext.REFERENCE_TARGET, referenceExpression] ?:
- context[BindingContext.REFERENCE_TARGET, referenceExpression.getChildOfType
$renderedComment"
// }
- }
- else {
+ } else {
if (declarationDescriptor is CallableDescriptor) { // If we couldn't find KDoc, try to find javadoc in one of super's
val psi = declarationDescriptor.findPsi() as? KtFunction
if (psi != null) {
@@ -352,8 +347,8 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
}
private fun renderDeprecationInfo(
- declarationDescriptor: DeclarationDescriptor,
- deprecationResolver: DeprecationResolver
+ declarationDescriptor: DeclarationDescriptor,
+ deprecationResolver: DeprecationResolver
): String {
val deprecation = deprecationResolver.getDeprecations(declarationDescriptor).firstOrNull() ?: return ""
@@ -387,7 +382,11 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
wrap("<$tag>", "$tag>", body)
}
- private fun mixKotlinToJava(declarationDescriptor: DeclarationDescriptor, element: PsiElement, originalElement: PsiElement?): String? {
+ private fun mixKotlinToJava(
+ declarationDescriptor: DeclarationDescriptor,
+ element: PsiElement,
+ originalElement: PsiElement?
+ ): String? {
val originalInfo = JavaDocumentationProvider().getQuickNavigateInfo(element, originalElement)
if (originalInfo != null) {
val renderedDecl = constant { DESCRIPTOR_RENDERER.withOptions { withDefinedIn = false } }.render(declarationDescriptor)