MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] kdoc: delegate rendering of fake top level classes to java

Browse Source 
^KTIJ-26262 fixed

GitOrigin-RevId: 530d578ef005c0e86d8a37e9350b30130d973e9a
This commit is contained in:
Anna Kozlova
2024-07-04 07:40:14 +00:00
committed by intellij-monorepo-bot
parent 0026ff6702
commit 6fc6ec2170
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinPsiDocumentationTargetProvider.kt
+9 -1
View File
@@ -11,6 +11,7 @@ import com.intellij.platform.backend.documentation.PsiDocumentationTargetProvide
import com.intellij.psi.PsiDocCommentBase
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.kdoc.KDocRenderer.renderKDoc
@@ -21,7 +22,14 @@ import org.jetbrains.kotlin.psi.KtFile
class KotlinPsiDocumentationTargetProvider : PsiDocumentationTargetProvider {
override fun documentationTarget(element: PsiElement, originalElement: PsiElement?): DocumentationTarget? {
val elementWithDocumentation = element.navigationElement ?: element
return if (elementWithDocumentation.language.`is`(KotlinLanguage.INSTANCE)) KotlinDocumentationTarget(elementWithDocumentation, originalElement) else null
return if (elementWithDocumentation.language.`is`(KotlinLanguage.INSTANCE)) {
KotlinDocumentationTarget(elementWithDocumentation, originalElement).takeUnless {
// show documentation based on java presentation
elementWithDocumentation is KtFile && originalElement?.containingFile is PsiJavaFile
}
} else {
null
}
}
}
plugins/kotlin/idea/tests/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java
-1
View File
@@ -7,4 +7,3 @@ class KotlinPackageClassUsedFromJava {
}
//INFO: <div class="bottom"><icon src="AllIcons.Nodes.Package">&nbsp;<a href="psi_element://testing"><code><span style="color:#000000;">testing</span></code></a></div><div class='definition'><pre><span style="color:#000080;font-weight:bold;">public final</span> <span style="color:#000080;font-weight:bold;">class</span> <span style="color:#000000;">KotlinPackageClassUsedFromJava_DataKt</span></pre></div><table class='sections'></table>
// IGNORE_K2