[gradle] Refactor resource parser and update test data.

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResClassTask.kt

@@ -101,12 +101,13 @@ internal abstract class GenerateResClassTask : DefaultTask() {
         }
 
         if (typeString == "values" && file.name.equals("strings.xml", true)) {
-            val stringIds = getStringIds(file)
+            return getStringResources(file).mapNotNull { (typeName, strId) ->
-            val pluralStringIds = getPluralStringIds(file)
+                val type = when(typeName) {
-            return stringIds.map { strId ->
+                    "string", "string-array" -> ResourceType.STRING
-                ResourceItem(ResourceType.STRING, qualifiers, strId.asUnderscoredIdentifier(), path)
+                    "plurals" -> ResourceType.PLURAL_STRING
-            } + pluralStringIds.map { pluralStrId ->
+                    else -> return@mapNotNull null
-                ResourceItem(ResourceType.PLURAL_STRING, qualifiers, pluralStrId.asUnderscoredIdentifier(), path)
+                }
+                ResourceItem(type, qualifiers, strId.asUnderscoredIdentifier(), path)
             }
         }
 
@@ -114,23 +115,14 @@ internal abstract class GenerateResClassTask : DefaultTask() {
         return listOf(ResourceItem(type, qualifiers, file.nameWithoutExtension.asUnderscoredIdentifier(), path))
     }
 
-    private val stringTypeNames = listOf("string", "string-array")
+    //type -> id
-    private fun getStringIds(stringsXml: File): Set<String> {
+    private val stringTypeNames = listOf("string", "string-array", "plurals")
+    private fun getStringResources(stringsXml: File): List<Pair<String, String>> {
         val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stringsXml)
         val items = doc.getElementsByTagName("resources").item(0).childNodes
-        val ids = List(items.length) { items.item(it) }
+        return List(items.length) { items.item(it) }
             .filter { it.nodeName in stringTypeNames }
-            .map { it.attributes.getNamedItem("name").nodeValue }
+            .map { it.nodeName to it.attributes.getNamedItem("name").nodeValue }
-        return ids.toSet()
-    }
-
-    private fun getPluralStringIds(stringsXml: File): Set<String> {
-        val doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stringsXml)
-        val items = doc.getElementsByTagName("resources").item(0).childNodes
-        val ids = List(items.length) { items.item(it) }
-            .filter { it.nodeName == "plurals" }
-            .map { it.attributes.getNamedItem("name").nodeValue }
-        return ids.toSet()
     }
 
     private fun File.listNotHiddenFiles(): List<File> =

gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/Plurals0.kt

@@ -0,0 +1,26 @@
+@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
+
+package my.lib.res
+
+import kotlin.OptIn
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.PluralStringResource
+
+@ExperimentalResourceApi
+private object Plurals0 {
+    public val numberOfSongsAvailable: PluralStringResource by
+    lazy { init_numberOfSongsAvailable() }
+}
+
+@ExperimentalResourceApi
+public val Res.plurals.numberOfSongsAvailable: PluralStringResource
+    get() = Plurals0.numberOfSongsAvailable
+
+@ExperimentalResourceApi
+private fun init_numberOfSongsAvailable(): PluralStringResource =
+    org.jetbrains.compose.resources.PluralStringResource(
+        "plurals:numberOfSongsAvailable", "numberOfSongsAvailable",
+        setOf(
+            org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
+        )
+    )

gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/Res.kt

@@ -27,5 +27,7 @@ public object Res {
 
   public object string
 
+  public object plurals
+
   public object font
 }

gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Plurals0.kt

@@ -0,0 +1,26 @@
+@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
+
+package app.group.resources_test.generated.resources
+
+import kotlin.OptIn
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.PluralStringResource
+
+@ExperimentalResourceApi
+private object Plurals0 {
+    public val numberOfSongsAvailable: PluralStringResource by
+    lazy { init_numberOfSongsAvailable() }
+}
+
+@ExperimentalResourceApi
+internal val Res.plurals.numberOfSongsAvailable: PluralStringResource
+    get() = Plurals0.numberOfSongsAvailable
+
+@ExperimentalResourceApi
+private fun init_numberOfSongsAvailable(): PluralStringResource =
+    org.jetbrains.compose.resources.PluralStringResource(
+        "plurals:numberOfSongsAvailable", "numberOfSongsAvailable",
+        setOf(
+            org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
+        )
+    )

gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Res.kt

@@ -27,5 +27,7 @@ internal object Res {
 
   public object string
 
+  public object plurals
+
   public object font
 }

gradle-plugins/compose/src/test/test-projects/misc/commonResources/src/commonMain/composeResources/values/strings.xml

@@ -13,4 +13,14 @@
     <string name="PascalCase">PascalCase</string>
     <string name="1-kebab-case">1-kebab-case</string>
     <string name="camelCase">camelCase</string>
+
+    <plurals name="numberOfSongsAvailable">
+        <item quantity="zero">%d zero</item>
+        <item quantity="one">%d one</item>
+        <item quantity="two">%d two</item>
+        <item quantity="few">%d few</item>
+        <item quantity="many">%d many</item>
+        <item quantity="other">%d other</item>
+    </plurals>
+
 </resources>

gradle-plugins/compose/src/test/test-projects/misc/emptyResources/expected/Res.kt

@@ -27,5 +27,7 @@ internal object Res {
 
     public object string
 
+    public object plurals
+
     public object font
 }

gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/Res.kt

@@ -27,5 +27,7 @@ internal object Res {
 
     public object string
 
+    public object plurals
+
     public object font
 }