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

K2 UAST: avoid module lookup for fake PSI

Browse Source 
^KTIJ-34040 fixed

GitOrigin-RevId: 6429cb31ea559b6ddd7ea3b292fcd7be80bab4a7
This commit is contained in:
Jinseong Jeon
2025-05-09 14:12:52 +00:00
committed by intellij-monorepo-bot
parent 7094917ed4
commit 443d18fa69
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/uast/uast-kotlin-base/tests/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiFixtureTestBase.kt
+14 -6
View File
@@ -2623,16 +2623,16 @@ interface UastResolveApiFixtureTestBase {
"MyStringJVM.kt", """
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("MyStringsKt")
package test.pkg
annotation class MyAnnotation(
val myAttr: String = "defaultValue",
)
@MyAnnotation
inline fun <T> T.belongsToClassPart(): String = TODO()
@MyAnnotation("myAttrValue")
inline fun <reified T : Any> T.needFake(): String = TODO()
""".trimIndent()
@@ -2640,8 +2640,9 @@ interface UastResolveApiFixtureTestBase {
myFixture.configureByText(
"main.kt", """
import java.util.function.Consumer
import test.pkg.*
import test.pkg.belongsToClassPart
import test.pkg.needFake
fun test() {
Any().belongsToClassPart()
Any().needFake()
@@ -2653,6 +2654,13 @@ interface UastResolveApiFixtureTestBase {
try {
val uFile = myFixture.file.toUElementOfType<UFile>()!!
uFile.accept(object : AbstractUastVisitor() {
override fun visitImportStatement(node: UImportStatement): Boolean {
val txt = node.sourcePsi?.text
val resolved = node.resolve()
TestCase.assertNotNull(txt, resolved)
return super.visitImportStatement(node)
}
override fun visitCallExpression(node: UCallExpression): Boolean {
if (node.isConstructorCall()) {
// Like Any()
plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
+7
View File
@@ -35,6 +35,7 @@ import org.jetbrains.uast.*
import org.jetbrains.uast.analysis.KotlinExtensionConstants.LAMBDA_THIS_PARAMETER_NAME
import org.jetbrains.uast.kotlin.internal.*
import org.jetbrains.uast.kotlin.psi.UastFakeDeserializedSymbolAnnotation
import org.jetbrains.uast.kotlin.psi.UastFakeLightMethodBase
import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameterBase
interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderService {
@@ -493,6 +494,12 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
return resolvedTargetElement
}
// If the resolution result is "fake" PSI, it doesn't belong to any module.
// Before falling to the following module lookup, bail out here.
if (resolvedTargetElement is UastFakeLightMethodBase) {
return resolvedTargetElement
}
if (resolvedTargetElement != null) {
when (KaModuleProvider.getModule(project, resolvedTargetElement, useSiteModule = null)) {
is KaSourceModule -> {