refactor: rework the tokens model to allow keyed lookups

Author: lppedd

src/main/kotlin/com/github/lppedd/cc/api/impl/InternalCommitTokenProvider.kt

@@ -36,7 +36,7 @@ internal class InternalCommitTokenProvider(private val project: Project) :
 
   override fun getCommitScopes(type: String): Collection<CommitScope> {
     val defaultType = getTokens().types[type] ?: return emptyList()
-    return defaultType.scopes.map { DefaultCommitToken(it.name, it.description) }
+    return defaultType.scopes.map { (_, value) -> DefaultCommitToken(value.name, value.description) }
   }
 
   override fun getCommitFooterTypes(): Collection<CommitFooterType> =
@@ -62,7 +62,7 @@ internal class InternalCommitTokenProvider(private val project: Project) :
     }
 
     val defaultFooterType = getTokens().footerTypes[footerType] ?: return emptyList()
-    return defaultFooterType.values.map { DefaultCommitToken(it.name, it.description) }
+    return defaultFooterType.values.map { (_, value) -> DefaultCommitToken(value.name, value.description) }
   }
 
   private fun getTokens(): TokensModel {

src/main/kotlin/com/github/lppedd/cc/configuration/CCTokensService.kt

@@ -222,20 +222,20 @@ internal class CCTokensService(private val project: Project) {
     return null
   }
 
-  private fun buildTypes(jsonObject: JSONObject, commonScopes: List<CommitScopeModel>): Map<String, CommitTypeModel> =
+  private fun buildTypes(jsonObject: JSONObject, commonScopes: Map<String, CommitScopeModel>): Map<String, CommitTypeModel> =
     jsonObject.keySet().associateWith {
       val descriptor = jsonObject.getJSONObject(it)
       val description = descriptor.optString("description", "")
       val scopes = buildScopes(descriptor.optJSONObject("scopes") ?: JSONObject())
       CommitTypeModel(
         name = it,
         description = description,
-        scopes = scopes + commonScopes,
+        scopes = commonScopes + scopes,
       )
     }
 
-  private fun buildScopes(jsonObject: JSONObject): List<CommitScopeModel> =
-    jsonObject.keySet().map {
+  private fun buildScopes(jsonObject: JSONObject): Map<String, CommitScopeModel> =
+    jsonObject.keySet().associateWithTo(LinkedHashMap()) {
       val descriptor = jsonObject.getJSONObject(it)
       val description = descriptor.optString("description", "")
       CommitScopeModel(
@@ -256,8 +256,8 @@ internal class CCTokensService(private val project: Project) {
       )
     }
 
-  private fun buildFooterValues(jsonObject: JSONObject): List<CommitFooterValueModel> =
-    jsonObject.keySet().map {
+  private fun buildFooterValues(jsonObject: JSONObject): Map<String, CommitFooterValueModel> =
+    jsonObject.keySet().associateWithTo(LinkedHashMap()) {
       val descriptor = jsonObject.getJSONObject(it)
       val description = descriptor.optString("description", "")
       CommitFooterValueModel(
@@ -278,7 +278,7 @@ internal class CCTokensService(private val project: Project) {
       map[name] = CommitFooterTypeModel(
         name = name,
         description = description,
-        values = emptyList(),
+        values = emptyMap(),
       )
     }
 
@@ -293,7 +293,7 @@ internal class CCTokensService(private val project: Project) {
   class CommitTypeModel(
     val name: String,
     val description: String,
-    val scopes: List<CommitScopeModel>,
+    val scopes: Map<String, CommitScopeModel>,
   )
 
   class CommitScopeModel(
@@ -304,7 +304,7 @@ internal class CCTokensService(private val project: Project) {
   class CommitFooterTypeModel(
     val name: String,
     val description: String,
-    val values: List<CommitFooterValueModel>,
+    val values: Map<String, CommitFooterValueModel>,
   )
 
   class CommitFooterValueModel(

src/main/kotlin/com/github/lppedd/cc/configuration/component/DefaultTokensPanel.kt

@@ -2,7 +2,6 @@ package com.github.lppedd.cc.configuration.component
 
 import com.github.lppedd.cc.CC
 import com.github.lppedd.cc.CCBundle
-import com.github.lppedd.cc.configuration.CCTokensService.CommitScopeModel
 import com.github.lppedd.cc.configuration.CCTokensService.CommitTypeModel
 import com.github.lppedd.cc.configuration.component.tokens.CommitTokenList
 import com.github.lppedd.cc.scaled
@@ -45,7 +44,7 @@ internal class DefaultTokensPanel : JPanel(ScaledGridLayout(1, 1, 24, 1)) {
 
     if (selectedValue != null) {
       val jsonCommitType = latestTokens[selectedValue] ?: return
-      val scopes = jsonCommitType.scopes.map(CommitScopeModel::name)
+      val scopes = jsonCommitType.scopes.map { (_, value) -> value.name }
       scopeList.setTokens(scopes)
     }
   }