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

Minor. Add review fixes

Browse Source 
Didn't squash them because there are file-moving-renaming commits above
This commit is contained in:
Denis.Zharkov
2021-07-01 14:24:58 +03:00
committed by TeamCityServer
parent a3f64f65f2
commit 6e763f5a61
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirNotImplementedOverrideChecker.kt
+3 -2
View File
@@ -61,13 +61,14 @@ object FirNotImplementedOverrideChecker : FirClassChecker() {
fun collectSymbol(symbol: FirCallableSymbol<*>) { fun collectSymbol(symbol: FirCallableSymbol<*>) {
val fir = symbol.fir as? FirCallableMemberDeclaration ?: return val fir = symbol.fir as? FirCallableMemberDeclaration ?: return
if (fir.delegatedWrapperData != null) { val delegatedWrapperData = fir.delegatedWrapperData
if (delegatedWrapperData != null) {
val directOverriddenMembers = classScope.getDirectOverriddenMembers( val directOverriddenMembers = classScope.getDirectOverriddenMembers(
symbol, symbol,
unwrapIntersectionAndSubstitutionOverride = true unwrapIntersectionAndSubstitutionOverride = true
) )
val delegatedTo = fir.delegatedWrapperData!!.wrapped.unwrapFakeOverrides() val delegatedTo = delegatedWrapperData.wrapped.unwrapFakeOverrides()
if (symbol.fir.multipleDelegatesWithTheSameSignature == true) { if (symbol.fir.multipleDelegatesWithTheSameSignature == true) {
manyImplementationsDelegationSymbols.add(symbol) manyImplementationsDelegationSymbols.add(symbol)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDelegatedMemberScope.kt
+4 -4
View File
@@ -42,7 +42,7 @@ class FirDelegatedMemberScope(
val result = mutableListOf<FirNamedFunctionSymbol>() val result = mutableListOf<FirNamedFunctionSymbol>()
for (delegateField in delegateFields) { for (delegateField in delegateFields) {
processFunctionsFromSpecificField(delegateField, name, result) collectFunctionsFromSpecificField(delegateField, name, result)
} }
result.forEach(processor) result.forEach(processor)
@@ -53,7 +53,7 @@ class FirDelegatedMemberScope(
return delegateField.returnTypeRef.coneType.scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing) return delegateField.returnTypeRef.coneType.scope(session, scopeSession, FakeOverrideTypeCalculator.DoNothing)
} }
private fun processFunctionsFromSpecificField( private fun collectFunctionsFromSpecificField(
delegateField: FirField, delegateField: FirField,
name: Name, name: Name,
result: MutableList<FirNamedFunctionSymbol> result: MutableList<FirNamedFunctionSymbol>
@@ -109,7 +109,7 @@ class FirDelegatedMemberScope(
val result = mutableListOf<FirPropertySymbol>() val result = mutableListOf<FirPropertySymbol>()
for (delegateField in delegateFields) { for (delegateField in delegateFields) {
processPropertiesFromSpecificField(delegateField, name, result) collectPropertiesFromSpecificField(delegateField, name, result)
} }
result.forEach(processor) result.forEach(processor)
@@ -123,7 +123,7 @@ class FirDelegatedMemberScope(
declaredMemberScope.processDeclaredConstructors(processor) declaredMemberScope.processDeclaredConstructors(processor)
} }
private fun processPropertiesFromSpecificField( private fun collectPropertiesFromSpecificField(
delegateField: FirField, delegateField: FirField,
name: Name, name: Name,
result: MutableList<FirPropertySymbol> result: MutableList<FirPropertySymbol>