From 107b0229ef792c33026509dda7dd67235417f9ad Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Wed, 29 Mar 2023 20:56:11 -0700 Subject: [PATCH] SLC: use partition to distinguish ctor properties from regular member properties --- .../light/classes/symbol/classes/symbolLightClassUtils.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt index 226f24ec961..66e2ea3f4ac 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt @@ -592,7 +592,7 @@ internal fun SymbolLightClassBase.addPropertyBackingFields( filter { containingClass?.isInterface == true && !it.hasJvmFieldAnnotation() } } - val propertyGroups = propertySymbols.groupBy { it.isFromPrimaryConstructor } + val (ctorProperties, memberProperties) = propertySymbols.partition { it.isFromPrimaryConstructor } val nameGenerator = SymbolLightField.FieldNameGenerator() @@ -608,9 +608,9 @@ internal fun SymbolLightClassBase.addPropertyBackingFields( } // First, properties from parameters - propertyGroups[true]?.forEach(::addPropertyBackingField) + ctorProperties.forEach(::addPropertyBackingField) // Then, regular member properties - propertyGroups[false]?.forEach(::addPropertyBackingField) + memberProperties.forEach(::addPropertyBackingField) } context(KtAnalysisSession)