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

[FIR] Add unwrapFakeOverridesOrDelegated for symbols

Browse Source
This commit is contained in:
Nikolay Lunyak
2024-01-12 11:23:00 +02:00
committed by Space Team
parent c7d535ff46
commit 0b7e8c4708
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.js/src/org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsNameClashClassMembersChecker.kt
+1 -3
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
import org.jetbrains.kotlin.fir.declarations.utils.isFinal import org.jetbrains.kotlin.fir.declarations.utils.isFinal
import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol 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.FirCallableSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionCallableSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirIntersectionCallableSymbol
@@ -182,9 +181,8 @@ object FirJsNameClashClassMembersChecker : FirClassChecker() {
val nonFakeOverrideClashes = stableNames.collectNonFakeOverrideClashes { it in fakeOverrideStableNames } val nonFakeOverrideClashes = stableNames.collectNonFakeOverrideClashes { it in fakeOverrideStableNames }
for ((symbol, clashedWith) in nonFakeOverrideClashes) { for ((symbol, clashedWith) in nonFakeOverrideClashes) {
@OptIn(SymbolInternals::class)
val source = when (symbol) { val source = when (symbol) {
is FirCallableSymbol<*> -> symbol.fir.unwrapFakeOverridesOrDelegated().source is FirCallableSymbol<*> -> symbol.unwrapFakeOverridesOrDelegated().source
else -> symbol.source else -> symbol.source
} ?: declaration.source } ?: declaration.source
reporter.reportOn(source, FirJsErrors.JS_NAME_CLASH, name, clashedWith, context) reporter.reportOn(source, FirJsErrors.JS_NAME_CLASH, name, clashedWith, context)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/ClassMembers.kt
+3
View File
@@ -130,6 +130,9 @@ inline fun <reified D : FirCallableDeclaration> D.unwrapFakeOverridesOrDelegated
} while (true) } while (true)
} }
inline fun <reified D : FirCallableSymbol<*>> D.unwrapFakeOverridesOrDelegated(): FirCallableSymbol<*> =
fir.unwrapFakeOverridesOrDelegated().symbol
inline fun <reified D : FirCallableDeclaration> D.unwrapSubstitutionOverrides(): D { inline fun <reified D : FirCallableDeclaration> D.unwrapSubstitutionOverrides(): D {
var current = this var current = this