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

[SLC] SymbolLightClassForNamedClassLike: cleanup addMethodsFromCompanionIfNeeded function

Browse Source 
^KT-54051
This commit is contained in:
Dmitrii Gridin
2022-11-28 12:50:32 +01:00
committed by Space Team
parent ef9412e0aa
commit c9d1e2b0a2
3 changed files with 18 additions and 13 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
+3 -2
View File
@@ -157,7 +157,7 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
createConstructors(declaredMemberScope.getConstructors(), result) createConstructors(declaredMemberScope.getConstructors(), result)
addMethodsFromCompanionIfNeeded(result) addMethodsFromCompanionIfNeeded(result, classOrObjectSymbol)
addMethodsFromDataClass(result, classOrObjectSymbol) addMethodsFromDataClass(result, classOrObjectSymbol)
addDelegatesToInterfaceMethods(result, classOrObjectSymbol) addDelegatesToInterfaceMethods(result, classOrObjectSymbol)
@@ -346,5 +346,6 @@ internal open class SymbolLightClassForClassOrObject : SymbolLightClassForNamedC
override fun isAnnotationType(): Boolean = false override fun isAnnotationType(): Boolean = false
override fun copy(): SymbolLightClassForClassOrObject = SymbolLightClassForClassOrObject(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager) override fun copy(): SymbolLightClassForClassOrObject =
SymbolLightClassForClassOrObject(classOrObjectDeclaration, classOrObjectSymbolPointer, ktModule, manager)
} }
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForInterface.kt
+1 -1
View File
@@ -59,7 +59,7 @@ internal open class SymbolLightClassForInterface : SymbolLightClassForInterfaceO
.filterNot { it is KtFunctionSymbol && it.visibility.isPrivateOrPrivateToThis() } .filterNot { it is KtFunctionSymbol && it.visibility.isPrivateOrPrivateToThis() }
createMethods(visibleDeclarations, result) createMethods(visibleDeclarations, result)
addMethodsFromCompanionIfNeeded(result) addMethodsFromCompanionIfNeeded(result, classOrObjectSymbol)
result result
} }
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForNamedClassLike.kt
+14 -10
View File
@@ -47,26 +47,30 @@ abstract class SymbolLightClassForNamedClassLike : SymbolLightClassForClassLike<
manager = manager manager = manager
) )
context(KtAnalysisSession)
protected fun addMethodsFromCompanionIfNeeded( protected fun addMethodsFromCompanionIfNeeded(
result: MutableList<KtLightMethod>, result: MutableList<KtLightMethod>,
): Unit = withClassOrObjectSymbol { classOrObjectSymbol -> classOrObjectSymbol: KtNamedClassOrObjectSymbol,
classOrObjectSymbol.companionObject?.run { ) {
val methods = getDeclaredMemberScope().getCallableSymbols() val companionObjectSymbol = classOrObjectSymbol.companionObject ?: return
.filterIsInstance<KtFunctionSymbol>() val methods = companionObjectSymbol.getDeclaredMemberScope()
.filter { it.hasJvmStaticAnnotation() } .getCallableSymbols()
.filterIsInstance<KtFunctionSymbol>()
.filter { it.hasJvmStaticAnnotation() }
createMethods(methods, result) createMethods(methods, result)
val properties = getDeclaredMemberScope().getCallableSymbols().filterIsInstance<KtPropertySymbol>() companionObjectSymbol.getDeclaredMemberScope()
properties.forEach { property -> .getCallableSymbols()
.filterIsInstance<KtPropertySymbol>()
.forEach { property ->
createPropertyAccessors( createPropertyAccessors(
result, result,
property, property,
isTopLevel = false, isTopLevel = false,
onlyJvmStatic = true onlyJvmStatic = true,
) )
} }
}
} }
private val KtPropertySymbol.isConstOrJvmField: Boolean get() = isConst || hasJvmFieldAnnotation() private val KtPropertySymbol.isConstOrJvmField: Boolean get() = isConst || hasJvmFieldAnnotation()