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

FIR LC: additional checks on synthetic members of data class

Browse Source
This commit is contained in:
Jinseong Jeon
2021-09-24 14:35:51 -07:00
committed by Ilya Kirillov
parent 5af24dc6ce
commit 56867d9c7e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt
+9 -7
View File
@@ -159,14 +159,16 @@ internal class FirLightClassForSymbol(
val functionsFromAny = mutableMapOf<Name, KtFunctionSymbol>() val functionsFromAny = mutableMapOf<Name, KtFunctionSymbol>()
// NB: componentN and copy are added during RAW FIR, but synthetic members from `Any` are not. // NB: componentN and copy are added during RAW FIR, but synthetic members from `Any` are not.
// Thus, using declared member scope is not sufficient to lookup "all" synthetic members. // Thus, using declared member scope is not sufficient to lookup "all" synthetic members.
classOrObjectSymbol.getMemberScope().getCallableSymbols().forEach { symbol -> classOrObjectSymbol.getMemberScope().getCallableSymbols().forEach { functionSymbol ->
if (symbol is KtFunctionSymbol) { if (functionSymbol is KtFunctionSymbol) {
val name = symbol.name val name = functionSymbol.name
if (DataClassResolver.isCopy(name) || DataClassResolver.isComponentLike(name)) { if (functionSymbol.origin == KtSymbolOrigin.SOURCE_MEMBER_GENERATED &&
componentAndCopyFunctions.add(symbol) (DataClassResolver.isCopy(name) || DataClassResolver.isComponentLike(name))
) {
componentAndCopyFunctions.add(functionSymbol)
} }
if (name.isFromAny) { if (functionSymbol.dispatchType?.isAny == true && name.isFromAny) {
functionsFromAny[name] = symbol functionsFromAny[name] = functionSymbol
} }
} }
} }