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

FIR: Minor. Clarify naming for unwrapping overrides

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-09 19:22:25 +03:00
parent 89cbe9bf93
commit 28627e9754
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+1 -1
View File
@@ -85,7 +85,7 @@ class FirSyntheticPropertiesScope(
private fun FirFunctionSymbol<*>.hasJavaOverridden(): Boolean { private fun FirFunctionSymbol<*>.hasJavaOverridden(): Boolean {
var result = false var result = false
baseScope.processOverriddenFunctionsAndSelf(this) { baseScope.processOverriddenFunctionsAndSelf(this) {
if (it.unwrapOverridden().fir.origin == FirDeclarationOrigin.Enhancement) { if (it.unwrapSubstitutionOverrides().fir.origin == FirDeclarationOrigin.Enhancement) {
result = true result = true
ProcessorAction.STOP ProcessorAction.STOP
} else { } else {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassSubstitutionScope.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class FirClassSubstitutionScope(
functionSymbol: FirFunctionSymbol<*>, functionSymbol: FirFunctionSymbol<*>,
processor: (FirFunctionSymbol<*>) -> ProcessorAction processor: (FirFunctionSymbol<*>) -> ProcessorAction
): ProcessorAction { ): ProcessorAction {
val unwrapped = functionSymbol.unwrapOverriddenOnce() val unwrapped = functionSymbol.overriddenSymbol as FirFunctionSymbol<*>? ?: functionSymbol
return useSiteMemberScope.processOverriddenFunctions(unwrapped, processor) return useSiteMemberScope.processOverriddenFunctions(unwrapped, processor)
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt
+1 -7
View File
@@ -16,13 +16,7 @@ abstract class FirCallableSymbol<D : FirCallableDeclaration<D>> : AbstractFirBas
get() = null get() = null
} }
inline fun <reified E : FirCallableSymbol<*>> E.unwrapOverriddenOnce(): E { inline fun <reified E : FirCallableSymbol<*>> E.unwrapSubstitutionOverrides(): E {
overriddenSymbol?.let { return it as E }
return this
}
inline fun <reified E : FirCallableSymbol<*>> E.unwrapOverridden(): E {
var current = this var current = this
while (current.overriddenSymbol != null) { while (current.overriddenSymbol != null) {
current = current.overriddenSymbol as E current = current.overriddenSymbol as E