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

FIR: Rework FirNotImplementedOverrideChecker around delegated members reporting

Browse Source
This commit is contained in:
Denis.Zharkov
2021-06-29 18:10:28 +03:00
committed by TeamCityServer
parent a213ee0e01
commit a77cbb8f63
13 changed files with 132 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/scopes/FirTypeScope.kt
+39 -4
View File
@@ -5,8 +5,11 @@
package org.jetbrains.kotlin.fir.scopes
import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
import org.jetbrains.kotlin.fir.isIntersectionOverride
import org.jetbrains.kotlin.fir.originalForSubstitutionOverride
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.name.Name
@@ -140,24 +143,56 @@ inline fun FirTypeScope.processDirectlyOverriddenProperties(
processor(overridden)
}
fun FirTypeScope.getDirectOverriddenFunctions(function: FirNamedFunctionSymbol): List<FirNamedFunctionSymbol> {
fun FirTypeScope.getDirectOverriddenMembers(
member: FirCallableSymbol<*>,
unwrapIntersectionAndSubstitutionOverride: Boolean = false,
): List<FirCallableSymbol<out FirCallableMemberDeclaration>> =
when (member) {
is FirNamedFunctionSymbol -> getDirectOverriddenFunctions(member, unwrapIntersectionAndSubstitutionOverride)
is FirPropertySymbol -> getDirectOverriddenProperties(member, unwrapIntersectionAndSubstitutionOverride)
else -> emptyList()
}
fun FirTypeScope.getDirectOverriddenFunctions(
function: FirNamedFunctionSymbol,
unwrapIntersectionAndSubstitutionOverride: Boolean = false,
): List<FirNamedFunctionSymbol> {
val overriddenFunctions = mutableSetOf<FirNamedFunctionSymbol>()
processDirectlyOverriddenFunctions(function) {
overriddenFunctions.add(it)
overriddenFunctions.addOverridden(it, unwrapIntersectionAndSubstitutionOverride)
ProcessorAction.NEXT
}
return overriddenFunctions.toList()
}
fun FirTypeScope.getDirectOverriddenProperties(property: FirPropertySymbol): List<FirPropertySymbol> {
fun FirTypeScope.getDirectOverriddenProperties(
property: FirPropertySymbol,
unwrapIntersectionAndSubstitutionOverride: Boolean = false,
): List<FirPropertySymbol> {
val overriddenProperties = mutableSetOf<FirPropertySymbol>()
processDirectlyOverriddenProperties(property) {
overriddenProperties.add(it)
overriddenProperties.addOverridden(it, unwrapIntersectionAndSubstitutionOverride)
ProcessorAction.NEXT
}
return overriddenProperties.toList()
}
private inline fun <reified D : FirCallableSymbol<*>> MutableCollection<D>.addOverridden(
symbol: D,
unwrapIntersectionAndSubstitutionOverride: Boolean
) {
if (unwrapIntersectionAndSubstitutionOverride) {
if (symbol is FirIntersectionCallableSymbol) {
@Suppress("UNCHECKED_CAST")
addAll(symbol.intersections as Collection<D>)
} else {
add(symbol.originalForSubstitutionOverride ?: symbol)
}
} else {
add(symbol)
}
}