Refactor attribute parsing and merging methods in plugin (#55) (#56)

This commit improves the handling of attributes within the JetBrains package search plugin. Changes include renaming the `buildAttributesFromRawStrings` function to `parseAttributesFromRawStrings`, and refactoring its implementation for better readability. Additionally, a new `mergeAttributes` function has been added to handle cases where attributes need to be combined, improving code reusability and clarity. Co-authored-by: Lamberto Basti <[email protected]>
JetBrains · Feb 6, 2024 · b788f59 · b788f59
1 parent a312e73
commit b788f59
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 20 deletions.
diff --git a/...rc/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchModuleVariant.kt b/...rc/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchModuleVariant.kt
@@ -33,3 +33,4 @@ interface PackageSearchModuleVariant : PackageSearchDependencyManager {
     fun isCompatible(dependency: ApiPackage, version: ApiPackageVersion): Boolean
 
 }
+
diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt
@@ -21,17 +21,30 @@ fun Set<MppCompilationInfoModel.Compilation>.buildAttributes(): List<PackageSear
         }
     }.toSet()
 
-    return buildAttributesFromRawStrings(rawStrings)
+    return rawStrings.parseAttributesFromRawStrings()
 }
 
-fun buildAttributesFromRawStrings(rawStrings: Set<String>) = buildList {
-    var queue = rawStrings.toList()
+
+internal fun PackageSearchModuleVariant.Attribute.flatAttributesNames(): Set<String> {
+    return when (this) {
+        is PackageSearchModuleVariant.Attribute.StringAttribute -> setOf(value)
+        is PackageSearchModuleVariant.Attribute.NestedAttribute -> children.flatMap { it.flatAttributesNames() }.toSet()
+    }
+}
+
+fun List<PackageSearchModuleVariant.Attribute>.mergeAttributes() =
+    flatMap { it.flatAttributesNames() }
+        .toSet()
+        .parseAttributesFromRawStrings()
+
+fun Set<String>.parseAttributesFromRawStrings() = buildList {
+    var queue = this@parseAttributesFromRawStrings.toList()
     for (attributeTitle in KMP_ATTRIBUTES_GROUPS) {
         val (targets, rest) = queue
             .partition { it.contains(attributeTitle.aggregationKeyword, true) }
 
         if (targets.isEmpty()) continue
-        add(
+        this.add(
             PackageSearchModuleVariant.Attribute.NestedAttribute(
                 attributeTitle.displayName,
                 targets.map { PackageSearchModuleVariant.Attribute.StringAttribute(it) })

diff --git a/...n/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt b/...n/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt
@@ -6,7 +6,7 @@ import com.jetbrains.packagesearch.plugin.core.data.PackageSearchDeclaredPackage
 import com.jetbrains.packagesearch.plugin.core.data.listKMPAttributesNames
 import com.jetbrains.packagesearch.plugin.core.extensions.PackageSearchKnownRepositoriesContext
 import com.jetbrains.packagesearch.plugin.core.utils.icon
-import com.jetbrains.packagesearch.plugin.gradle.buildAttributesFromRawStrings
+import com.jetbrains.packagesearch.plugin.gradle.parseAttributesFromRawStrings
 import com.jetbrains.packagesearch.plugin.ui.model.getLatestVersion
 import org.jetbrains.packagesearch.api.v3.ApiMavenPackage
 import org.jetbrains.packagesearch.api.v3.ApiPackage
@@ -218,7 +218,7 @@ private fun MutableList<InfoPanelContent>.addAttributesFromNames(
     if (attributesNames.isNotEmpty()) add(
         InfoPanelContent.Attributes.FromPackage(
             tabTitleData = InfoPanelContent.TabTitleData(tabTitle = message("packagesearch.ui.toolwindow.sidepanel.platforms")),
-            attributes = buildAttributesFromRawStrings(attributesNames)
+            attributes = attributesNames.parseAttributesFromRawStrings()
         )
     )
 }
diff --git a/...n/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListItemEvent.kt b/...n/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListItemEvent.kt
@@ -29,8 +29,8 @@ sealed interface PackageListItemEvent {
             ) : OnHeaderAttributesClick
 
             @Serializable
-            data class SearchHeaderAttributesClick(
-                override val eventId: PackageListItem.Header.Id.Remote,
+            data class SearchHeaderWithVariantsAttributesClick(
+                override val eventId: PackageListItem.Header.Id.Remote.WithVariant,
                 val attributesNames: List<String>,
             ) : OnHeaderAttributesClick
 

diff --git a/...n/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt b/...n/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt
@@ -629,19 +629,23 @@ class PackageListViewModel(private val project: Project) : Disposable {
                 infoPanelViewModel.setDeclaredHeaderAttributes(event.variantName, attributes = attributes)
             }
 
-            is PackageListItemEvent.InfoPanelEvent.OnHeaderAttributesClick.SearchHeaderAttributesClick -> {
-                val attributes = module
-                    .variants
-                    .map { it.value.attributes }
-                    .flatten()
-                    .filter { it.value in event.attributesNames }
-                    .distinct()
+            is PackageListItemEvent.InfoPanelEvent.OnHeaderAttributesClick.SearchHeaderWithVariantsAttributesClick -> {
 
-                val variants = module.variants.values.map { it.name } - module.mainVariantName
+                val variants = event.eventId
+                    .compatibleVariantNames
+                    .mapNotNull { module.variants[it] }
+
+                val defaultVariant = variants.firstOrNull { it.isPrimary }?.name
+                    ?: variants.firstOrNull()?.name
+                    ?: return
+
+                val attributes = variants.firstOrNull()
+                    ?.attributes
+                    ?: return
 
                 infoPanelViewModel.setSearchHeaderAttributes(
-                    defaultVariant = module.mainVariantName,
-                    additionalVariants = variants,
+                    defaultVariant = defaultVariant,
+                    additionalVariants = variants.map { it.name } - defaultVariant,
                     attributes = attributes
                 )
             }

diff --git a/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt b/.../kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt
@@ -104,8 +104,8 @@ fun PackageListHeader(
                         .onClick {
                             val event =
                                 when (content.id) {
-                                    is PackageListItem.Header.Id.Declared.Base -> return@onClick
-                                    is PackageListItem.Header.Id.Remote -> PackageListItemEvent.InfoPanelEvent.OnHeaderAttributesClick.SearchHeaderAttributesClick(
+                                    is PackageListItem.Header.Id.Declared.Base, is PackageListItem.Header.Id.Remote.Base -> return@onClick
+                                    is PackageListItem.Header.Id.Remote.WithVariant -> PackageListItemEvent.InfoPanelEvent.OnHeaderAttributesClick.SearchHeaderWithVariantsAttributesClick(
                                         eventId = content.id,
                                         attributesNames = content.attributes
                                     )