[FIR] Add unwrapFakeOverridesOrDelegated for symbols
This commit is contained in:
committed by
Space Team
parent
c7d535ff46
commit
0b7e8c4708
+1
-3
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
|
||||
import org.jetbrains.kotlin.fir.declarations.utils.isFinal
|
||||
import org.jetbrains.kotlin.fir.scopes.*
|
||||
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionCallableSymbol
|
||||
@@ -182,9 +181,8 @@ object FirJsNameClashClassMembersChecker : FirClassChecker() {
|
||||
|
||||
val nonFakeOverrideClashes = stableNames.collectNonFakeOverrideClashes { it in fakeOverrideStableNames }
|
||||
for ((symbol, clashedWith) in nonFakeOverrideClashes) {
|
||||
@OptIn(SymbolInternals::class)
|
||||
val source = when (symbol) {
|
||||
is FirCallableSymbol<*> -> symbol.fir.unwrapFakeOverridesOrDelegated().source
|
||||
is FirCallableSymbol<*> -> symbol.unwrapFakeOverridesOrDelegated().source
|
||||
else -> symbol.source
|
||||
} ?: declaration.source
|
||||
reporter.reportOn(source, FirJsErrors.JS_NAME_CLASH, name, clashedWith, context)
|
||||
|
||||
@@ -130,6 +130,9 @@ inline fun <reified D : FirCallableDeclaration> D.unwrapFakeOverridesOrDelegated
|
||||
} while (true)
|
||||
}
|
||||
|
||||
inline fun <reified D : FirCallableSymbol<*>> D.unwrapFakeOverridesOrDelegated(): FirCallableSymbol<*> =
|
||||
fir.unwrapFakeOverridesOrDelegated().symbol
|
||||
|
||||
inline fun <reified D : FirCallableDeclaration> D.unwrapSubstitutionOverrides(): D {
|
||||
var current = this
|
||||
|
||||
|
||||
Reference in New Issue
Block a user