[SLC] drop redundant labels for KtAnalysisSession
^KT-54051
This commit is contained in:
committed by
Space Team
parent
c9d1e2b0a2
commit
3e73522d3b
+7
-7
@@ -166,7 +166,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
|
||||
}
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
private fun addMethodsFromDataClass(result: MutableList<KtLightMethod>, classOrObjectSymbol: KtNamedClassOrObjectSymbol) {
|
||||
if (!classOrObjectSymbol.isData) return
|
||||
|
||||
@@ -175,7 +175,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
|
||||
val lightMemberOrigin = classOrObjectDeclaration?.let { LightMemberOriginForDeclaration(it, JvmDeclarationOriginKind.OTHER) }
|
||||
result.add(
|
||||
SymbolLightSimpleMethod(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
ktFunctionSymbol,
|
||||
lightMemberOrigin,
|
||||
this,
|
||||
@@ -224,14 +224,14 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
|
||||
private val Name.isFromAny: Boolean
|
||||
get() = this == EQUALS || this == HASHCODE_NAME || this == TO_STRING
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
private fun addDelegatesToInterfaceMethods(result: MutableList<KtLightMethod>, classOrObjectSymbol: KtNamedClassOrObjectSymbol) {
|
||||
fun createDelegateMethod(ktFunctionSymbol: KtFunctionSymbol) {
|
||||
val kotlinOrigin = ktFunctionSymbol.psiSafe<KtDeclaration>() ?: classOrObjectDeclaration
|
||||
val lightMemberOrigin = kotlinOrigin?.let { LightMemberOriginForDeclaration(it, JvmDeclarationOriginKind.DELEGATION) }
|
||||
result.add(
|
||||
SymbolLightSimpleMethod(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
ktFunctionSymbol,
|
||||
lightMemberOrigin,
|
||||
this,
|
||||
@@ -310,13 +310,13 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
|
||||
propertyGroups[false]?.forEach(::addPropertyBackingField)
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
private fun addInstanceFieldIfNeeded(result: MutableList<KtLightField>, namedClassOrObjectSymbol: KtNamedClassOrObjectSymbol) {
|
||||
if (!isNamedObject || isLocal) return
|
||||
|
||||
result.add(
|
||||
SymbolLightFieldForObject(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
objectSymbol = namedClassOrObjectSymbol,
|
||||
containingClass = this,
|
||||
name = JvmAbi.INSTANCE_FIELD,
|
||||
@@ -325,7 +325,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
|
||||
)
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
private fun addFieldsForEnumEntries(result: MutableList<KtLightField>, classOrObjectSymbol: KtNamedClassOrObjectSymbol) {
|
||||
if (!isEnum) return
|
||||
|
||||
|
||||
+4
-4
@@ -77,7 +77,7 @@ abstract class SymbolLightClassForNamedClassLike : SymbolLightClassForClassLike<
|
||||
|
||||
private val KtPropertySymbol.isConst: Boolean get() = (this as? KtKotlinPropertySymbol)?.isConst == true
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
protected fun addFieldsFromCompanionIfNeeded(
|
||||
result: MutableList<KtLightField>,
|
||||
classOrObjectSymbol: KtNamedClassOrObjectSymbol,
|
||||
@@ -91,7 +91,7 @@ abstract class SymbolLightClassForNamedClassLike : SymbolLightClassForClassLike<
|
||||
}
|
||||
?.mapTo(result) {
|
||||
SymbolLightFieldForProperty(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
propertySymbol = it,
|
||||
fieldName = it.name.asString(),
|
||||
containingClass = this,
|
||||
@@ -103,7 +103,7 @@ abstract class SymbolLightClassForNamedClassLike : SymbolLightClassForClassLike<
|
||||
}
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
protected fun addCompanionObjectFieldIfNeeded(result: MutableList<KtLightField>, classOrObjectSymbol: KtNamedClassOrObjectSymbol) {
|
||||
val companionObjectSymbols: List<KtNamedClassOrObjectSymbol>? = classOrObjectDeclaration?.companionObjects?.mapNotNull {
|
||||
it.getNamedClassOrObjectSymbol()
|
||||
@@ -112,7 +112,7 @@ abstract class SymbolLightClassForNamedClassLike : SymbolLightClassForClassLike<
|
||||
companionObjectSymbols?.forEach {
|
||||
result.add(
|
||||
SymbolLightFieldForObject(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
objectSymbol = it,
|
||||
containingClass = this,
|
||||
name = it.name.asString(),
|
||||
|
||||
+14
-14
@@ -61,28 +61,28 @@ internal fun createLightClassNoCache(ktClassOrObject: KtClassOrObject, ktModule:
|
||||
else -> SymbolLightClassForClassOrObject(ktClassOrObject, ktModule)
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
internal fun createLightClassNoCache(
|
||||
ktClassOrObjectSymbol: KtNamedClassOrObjectSymbol,
|
||||
ktModule: KtModule,
|
||||
manager: PsiManager,
|
||||
): SymbolLightClassBase = when (ktClassOrObjectSymbol.classKind) {
|
||||
KtClassKind.INTERFACE -> SymbolLightClassForInterface(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
ktModule = ktModule,
|
||||
classOrObjectSymbol = ktClassOrObjectSymbol,
|
||||
manager = manager,
|
||||
)
|
||||
|
||||
KtClassKind.ANNOTATION_CLASS -> SymbolLightClassForAnnotationClass(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
ktModule = ktModule,
|
||||
classOrObjectSymbol = ktClassOrObjectSymbol,
|
||||
manager = manager,
|
||||
)
|
||||
|
||||
else -> SymbolLightClassForClassOrObject(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
ktModule = ktModule,
|
||||
classOrObjectSymbol = ktClassOrObjectSymbol,
|
||||
manager = manager,
|
||||
@@ -100,7 +100,7 @@ private fun lightClassForEnumEntry(ktEnumEntry: KtEnumEntry): KtLightClass? {
|
||||
return (targetField as? SymbolLightFieldForEnumEntry)?.initializingClass as? KtLightClass
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
internal fun SymbolLightClassForClassLike<*>.createConstructors(
|
||||
declarations: Sequence<KtConstructorSymbol>,
|
||||
result: MutableList<KtLightMethod>,
|
||||
@@ -116,7 +116,7 @@ internal fun SymbolLightClassForClassLike<*>.createConstructors(
|
||||
|
||||
result.add(
|
||||
SymbolLightConstructor(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
constructorSymbol = constructor,
|
||||
lightMemberOrigin = null,
|
||||
containingClass = this@createConstructors,
|
||||
@@ -126,7 +126,7 @@ internal fun SymbolLightClassForClassLike<*>.createConstructors(
|
||||
|
||||
createJvmOverloadsIfNeeded(constructor, result) { methodIndex, argumentSkipMask ->
|
||||
SymbolLightConstructor(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
constructorSymbol = constructor,
|
||||
lightMemberOrigin = null,
|
||||
containingClass = this@createConstructors,
|
||||
@@ -185,7 +185,7 @@ private fun SymbolLightClassForClassLike<*>.noArgConstructor(
|
||||
methodIndex,
|
||||
)
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
internal fun SymbolLightClassBase.createMethods(
|
||||
declarations: Sequence<KtCallableSymbol>,
|
||||
result: MutableList<KtLightMethod>,
|
||||
@@ -241,11 +241,11 @@ internal fun SymbolLightClassBase.createMethods(
|
||||
|
||||
// Regular members
|
||||
regularMembers.forEach {
|
||||
this@ktAnalysisSession.handleDeclaration(it)
|
||||
this@KtAnalysisSession.handleDeclaration(it)
|
||||
}
|
||||
// Then, properties from the primary constructor parameters
|
||||
ctorProperties.forEach {
|
||||
this@ktAnalysisSession.handleDeclaration(it)
|
||||
this@KtAnalysisSession.handleDeclaration(it)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ private inline fun <T : KtFunctionLikeSymbol> SymbolLightClassBase.createJvmOver
|
||||
}
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
internal fun SymbolLightClassBase.createPropertyAccessors(
|
||||
result: MutableList<KtLightMethod>,
|
||||
declaration: KtPropertySymbol,
|
||||
@@ -311,7 +311,7 @@ internal fun SymbolLightClassBase.createPropertyAccessors(
|
||||
}
|
||||
|
||||
return SymbolLightAccessorMethod(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
propertyAccessorSymbol = accessor,
|
||||
containingPropertySymbol = declaration,
|
||||
lightMemberOrigin = lightMemberOrigin,
|
||||
@@ -334,7 +334,7 @@ internal fun SymbolLightClassBase.createPropertyAccessors(
|
||||
}
|
||||
}
|
||||
|
||||
context(ktAnalysisSession@KtAnalysisSession)
|
||||
context(KtAnalysisSession)
|
||||
internal fun SymbolLightClassBase.createField(
|
||||
declaration: KtPropertySymbol,
|
||||
nameGenerator: SymbolLightField.FieldNameGenerator,
|
||||
@@ -368,7 +368,7 @@ internal fun SymbolLightClassBase.createField(
|
||||
|
||||
result.add(
|
||||
SymbolLightFieldForProperty(
|
||||
ktAnalysisSession = this@ktAnalysisSession,
|
||||
ktAnalysisSession = this@KtAnalysisSession,
|
||||
propertySymbol = declaration,
|
||||
fieldName = fieldName,
|
||||
containingClass = this,
|
||||
|
||||
Reference in New Issue
Block a user