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

[SLC] drop redundant labels for KtAnalysisSession

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