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

[FE] Add isLocal name to ClassId constructor calls where it needed

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-09-19 13:08:42 +03:00
committed by Space Team
parent adaf8ae46a
commit 9e5ee3afa0
39 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/base/Kt1DescUtils.kt
+1 -1
View File
@@ -567,7 +567,7 @@ internal val ClassifierDescriptor.classId: ClassId?
}
internal val ClassifierDescriptor.maybeLocalClassId: ClassId
get() = classId ?: ClassId(containingPackage() ?: FqName.ROOT, FqName.topLevel(this.name), true)
get() = classId ?: ClassId(containingPackage() ?: FqName.ROOT, FqName.topLevel(this.name), isLocal = true)
internal fun ClassDescriptor.getSupertypesWithAny(): Collection<KotlinType> {
val supertypes = typeConstructor.supertypes
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/pointers/KtFe10DescFunctionLikeSymbolPointer.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class KtFe10DescFunctionLikeSymbolPointer<T : KtFunctionLikeSymbol>(
val className = callableId.className
val memberScope = if (className != null) {
val outerClassId = ClassId(callableId.packageName, className, false)
val outerClassId = ClassId(callableId.packageName, className, isLocal = false)
analysisContext.resolveSession.moduleDescriptor.findClassAcrossModuleDependencies(outerClassId)
?.unsubstitutedMemberScope
?: MemberScope.Empty