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

[FIR JS] Fix the false report of JS_NAME_CLASH on external generic class

Browse Source 
^KT-61862 Fixed
This commit is contained in:
Alexander Korepanov
2023-09-12 14:21:01 +02:00
committed by Space Team
parent 9e7d9f3b53
commit 98fdaeb9a7
1 changed files with 6 additions and 1 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
+6 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.analysis.js.checkers.*
import org.jetbrains.kotlin.fir.analysis.js.checkers.FirJsStableName import org.jetbrains.kotlin.fir.analysis.js.checkers.FirJsStableName
import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration import org.jetbrains.kotlin.fir.declarations.FirClassLikeDeclaration
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
@@ -67,10 +68,14 @@ object FirJsNameClashClassMembersChecker : FirClassChecker() {
if (stableName.isPresentInGeneratedCode) { if (stableName.isPresentInGeneratedCode) {
add(stableName.copy(symbol = targetSymbol)) add(stableName.copy(symbol = targetSymbol))
} else { } else {
val isPresentInGeneratedCode = when (targetSymbol.origin) {
is FirDeclarationOrigin.SubstitutionOverride -> overriddenSymbol.isPresentInGeneratedCode(context.session)
else -> targetSymbol.isPresentInGeneratedCode(context.session)
}
val inheritedExternalName = stableName.copy( val inheritedExternalName = stableName.copy(
symbol = targetSymbol, symbol = targetSymbol,
canBeMangled = false, canBeMangled = false,
isPresentInGeneratedCode = targetSymbol.isPresentInGeneratedCode(context.session) isPresentInGeneratedCode = isPresentInGeneratedCode
) )
add(inheritedExternalName) add(inheritedExternalName)
} }