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

FIR/LC: use DataClassResolver when determining componentN/copy

Browse Source
This commit is contained in:
Jinseong Jeon
2021-09-24 11:53:58 -07:00
committed by Ilya Kirillov
parent ac53166960
commit 5af24dc6ce
4 changed files with 11 additions and 38 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
+2 -13
View File
@@ -15,12 +15,12 @@ import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_BASE
import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.elements.KtLightField
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.builtins.StandardNames.DATA_CLASS_COPY
import org.jetbrains.kotlin.builtins.StandardNames.HASHCODE_NAME
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.light.classes.symbol.classes.*
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DataClassResolver
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
import org.jetbrains.kotlin.util.OperatorNameConventions.EQUALS
import org.jetbrains.kotlin.util.OperatorNameConventions.TO_STRING
@@ -162,7 +162,7 @@ internal class FirLightClassForSymbol(
classOrObjectSymbol.getMemberScope().getCallableSymbols().forEach { symbol ->
if (symbol is KtFunctionSymbol) {
val name = symbol.name
if (name.isCopy || name.isComponentN) {
if (DataClassResolver.isCopy(name) || DataClassResolver.isComponentLike(name)) {
componentAndCopyFunctions.add(symbol)
}
if (name.isFromAny) {
@@ -178,17 +178,6 @@ internal class FirLightClassForSymbol(
}
}
private val Name.isCopy: Boolean
get() = this == DATA_CLASS_COPY
private val Name.isComponentN: Boolean
get() {
if (isSpecial) return false
if (!identifier.startsWith("component")) return false
val n = identifier.substring("component".length).toIntOrNull()
return n != null && n > 0
}
private val Name.isFromAny: Boolean
get() = this == EQUALS || this == HASHCODE_NAME || this == TO_STRING