From fba480875f20d714dadac2158a821c524e1c8bcf Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 2 Aug 2021 22:16:21 -0700 Subject: [PATCH] FIR LC: populate constructors after member methods --- .../kotlin/idea/asJava/classes/FirLightClassForSymbol.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt index 0f93c9c97db..c33c23f4ced 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt @@ -88,8 +88,6 @@ internal class FirLightClassForSymbol( analyzeWithSymbolAsContext(classOrObjectSymbol) { val declaredMemberScope = classOrObjectSymbol.getDeclaredMemberScope() - createConstructors(declaredMemberScope.getConstructors(), result) - val visibleDeclarations = declaredMemberScope.getCallableSymbols().applyIf(isEnum) { filterNot { function -> function is KtFunctionSymbol && function.name.asString().let { it == "values" || it == "valueOf" } @@ -102,6 +100,8 @@ internal class FirLightClassForSymbol( val suppressStatic = classOrObjectSymbol.classKind == KtClassKind.COMPANION_OBJECT createMethods(visibleDeclarations, result, suppressStaticForMethods = suppressStatic) + + createConstructors(declaredMemberScope.getConstructors(), result) } addMethodsFromCompanionIfNeeded(result) @@ -221,4 +221,4 @@ internal class FirLightClassForSymbol( FirLightClassForSymbol(classOrObjectSymbol, manager) override fun isValid(): Boolean = super.isValid() && classOrObjectSymbol.isValid() -} \ No newline at end of file +}