[FE] Add isLocal name to ClassId constructor calls where it needed
This commit is contained in:
committed by
Space Team
parent
adaf8ae46a
commit
9e5ee3afa0
+1
-1
@@ -30,7 +30,7 @@ internal class FirResolvedImportImpl(
|
||||
override val isAllUnder: Boolean get() = delegate.isAllUnder
|
||||
override val aliasName: Name? get() = delegate.aliasName
|
||||
override val aliasSource: KtSourceElement? get() = delegate.aliasSource
|
||||
override val resolvedParentClassId: ClassId? get() = relativeParentClassName?.let { ClassId(packageFqName, it, false) }
|
||||
override val resolvedParentClassId: ClassId? get() = relativeParentClassName?.let { ClassId(packageFqName, it, isLocal = false) }
|
||||
override val importedName: Name? get() = importedFqName?.shortName()
|
||||
|
||||
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ internal class FirErrorResolvedQualifierImpl(
|
||||
override val diagnostic: ConeDiagnostic,
|
||||
) : FirErrorResolvedQualifier() {
|
||||
override val classId: ClassId? get() = relativeClassFqName?.let {
|
||||
ClassId(packageFqName, it, false)
|
||||
ClassId(packageFqName, it, isLocal = false)
|
||||
}
|
||||
override val resolvedToCompanionObject: Boolean get() = false
|
||||
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ internal class FirResolvedQualifierImpl(
|
||||
override var typeArguments: MutableOrEmptyList<FirTypeProjection>,
|
||||
) : FirResolvedQualifier() {
|
||||
override val classId: ClassId? get() = relativeClassFqName?.let {
|
||||
ClassId(packageFqName, it, false)
|
||||
ClassId(packageFqName, it, isLocal = false)
|
||||
}
|
||||
override var resolvedToCompanionObject: Boolean = (symbol?.fir as? FirRegularClass)?.companionObjectSymbol != null
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@ class FirRegularClassSymbol(classId: ClassId) : FirClassSymbol<FirRegularClass>(
|
||||
}
|
||||
|
||||
class FirAnonymousObjectSymbol(packageFqName: FqName) : FirClassSymbol<FirAnonymousObject>(
|
||||
ClassId(packageFqName, SpecialNames.ANONYMOUS_FQ_NAME, true)
|
||||
ClassId(packageFqName, SpecialNames.ANONYMOUS_FQ_NAME, isLocal = true)
|
||||
)
|
||||
|
||||
class FirTypeAliasSymbol(classId: ClassId) : FirClassLikeSymbol<FirTypeAlias>(classId), TypeAliasSymbolMarker {
|
||||
|
||||
+2
-2
@@ -64,7 +64,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
|
||||
|
||||
default("resolvedParentClassId") {
|
||||
delegate = "relativeParentClassName"
|
||||
delegateCall = "let { ClassId(packageFqName, it, false) }"
|
||||
delegateCall = "let { ClassId(packageFqName, it, isLocal = false) }"
|
||||
withGetter = true
|
||||
}
|
||||
|
||||
@@ -703,7 +703,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
|
||||
default("classId") {
|
||||
value = """
|
||||
|relativeClassFqName?.let {
|
||||
| ClassId(packageFqName, it, false)
|
||||
| ClassId(packageFqName, it, isLocal = false)
|
||||
|}
|
||||
""".trimMargin()
|
||||
withGetter = true
|
||||
|
||||
Reference in New Issue
Block a user