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

Fix PsiType for local class in FE10 Analysis API

Browse Source 
After this commit,
Fe10IdeNormalAnalysisSourceModuleAnalysisApiPsiTypeProviderTestGenerated
test group passes
This commit is contained in:
Mikhail Glukhikh
2022-05-23 16:14:59 +02:00
committed by Space
parent ffc17bea55
commit 213445347d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/utils/KtFe10JvmTypeMapperContext.kt
+6 -6
View File
@@ -57,12 +57,12 @@ internal class KtFe10JvmTypeMapperContext(private val resolveSession: ResolveSes
return when (val declaration = typeConstructor.declarationDescriptor) { return when (val declaration = typeConstructor.declarationDescriptor) {
is TypeParameterDescriptor -> declaration.name.asString().sanitize() is TypeParameterDescriptor -> declaration.name.asString().sanitize()
is TypeAliasDescriptor -> getClassInternalName(declaration.expandedType.constructor) is TypeAliasDescriptor -> getClassInternalName(declaration.expandedType.constructor)
is ClassDescriptor -> computeNonLocalClassInternalName(declaration) ?: computeSupertypeInternalName(declaration) is ClassDescriptor -> computeClassInternalName(declaration) ?: computeSupertypeInternalName(declaration)
else -> error("Unexpected declaration type: $declaration") else -> error("Unexpected declaration type: $declaration")
} }
} }
private fun computeNonLocalClassInternalName(descriptor: ClassDescriptor): String? { private fun computeClassInternalName(descriptor: ClassDescriptor): String? {
val selfName = descriptor.name.takeIf { !it.isSpecial } ?: return null val selfName = descriptor.name.takeIf { !it.isSpecial } ?: return null
return when (val parent = descriptor.containingDeclaration) { return when (val parent = descriptor.containingDeclaration) {
@@ -71,10 +71,10 @@ internal class KtFe10JvmTypeMapperContext(private val resolveSession: ResolveSes
"$packageInternalName/$selfName" "$packageInternalName/$selfName"
} }
is ClassDescriptor -> { is ClassDescriptor -> {
val parentInternalName = computeNonLocalClassInternalName(parent) val parentInternalName = computeClassInternalName(parent)
if (parentInternalName != null) "$parentInternalName$$selfName" else null if (parentInternalName != null) "$parentInternalName$$selfName" else null
} }
else -> null else -> selfName.asString()
} }
} }
@@ -89,12 +89,12 @@ internal class KtFe10JvmTypeMapperContext(private val resolveSession: ResolveSes
} }
if (declaration.kind != ClassKind.INTERFACE && declaration.kind != ClassKind.ANNOTATION_CLASS) { if (declaration.kind != ClassKind.INTERFACE && declaration.kind != ClassKind.ANNOTATION_CLASS) {
val internalName = computeNonLocalClassInternalName(declaration) val internalName = computeClassInternalName(declaration)
if (internalName != null) { if (internalName != null) {
return internalName return internalName
} }
} else if (interfaceSupertypeInternalName == null) { } else if (interfaceSupertypeInternalName == null) {
interfaceSupertypeInternalName = computeNonLocalClassInternalName(declaration) interfaceSupertypeInternalName = computeClassInternalName(declaration)
} }
} }