[FIR] rename requiredPhase to requiredMembersPhase for type scope
Also move `requiredMembersPhase` use inside `unsubstitutedScope` ^KT-56551
This commit is contained in:
committed by
Space Team
parent
52ce302095
commit
aaf173687b
+1
-1
@@ -279,7 +279,7 @@ internal class KtFirScopeProvider(
|
||||
firResolveSession.useSiteFirSession,
|
||||
getScopeSession(),
|
||||
FakeOverrideTypeCalculator.Forced,
|
||||
requiredPhase = FirResolvePhase.STATUS,
|
||||
requiredMembersPhase = FirResolvePhase.STATUS,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
@@ -234,8 +234,9 @@ internal object FirReferenceResolveHelper {
|
||||
session,
|
||||
analysisSession.getScopeSessionFor(analysisSession.useSiteSession),
|
||||
FakeOverrideTypeCalculator.DoNothing,
|
||||
requiredPhase = FirResolvePhase.STATUS
|
||||
requiredMembersPhase = FirResolvePhase.STATUS,
|
||||
) ?: return emptyList()
|
||||
|
||||
return buildList {
|
||||
scope.processFunctionsByName(OperatorNameConventions.EQUALS) { functionSymbol ->
|
||||
val parameterSymbol = functionSymbol.valueParameterSymbols.singleOrNull()
|
||||
|
||||
+3
-2
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
@@ -56,8 +56,9 @@ internal class KtFirPropertySetterSymbol(
|
||||
session,
|
||||
analysisSession.getScopeSessionFor(session),
|
||||
FakeOverrideTypeCalculator.DoNothing,
|
||||
requiredPhase = FirResolvePhase.STATUS,
|
||||
requiredMembersPhase = FirResolvePhase.STATUS,
|
||||
) ?: return false
|
||||
|
||||
val overriddenProperties = containingClassScope.getDirectOverriddenProperties(propertySymbol)
|
||||
overriddenProperties.any { it.isVar }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user