[resources] Init resource accessors lazily and in external function t…

…o avoid MethodTooLargeException (#4404) fixes #4194
JetBrains · Mar 5, 2024 · 8ad5473 · 8ad5473
1 parent 204a6f5
commit 8ad5473
Show file tree

Hide file tree

Showing 108 changed files with 126,103 additions and 546,465 deletions.
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt
@@ -188,42 +188,50 @@ private fun getChunkFileSpec(
         val objectSpec = TypeSpec.objectBuilder(chunkClassName).also { typeObject ->
             typeObject.addModifiers(KModifier.PRIVATE)
             typeObject.addAnnotation(experimentalAnnotation)
-            val properties = idToResources.map { (resName, items) ->
+            val properties = idToResources.keys.map { resName ->
                 PropertySpec.builder(resName, type.getClassName())
-                    .initializer(
-                        CodeBlock.builder()
-                            .add("%T(\n", type.getClassName()).withIndent {
-                                add("\"${type}:${resName}\",")
-                                if (type == ResourceType.STRING) add(" \"$resName\",")
-                                withIndent {
-                                    add("\nsetOf(\n").withIndent {
-                                        items.forEach { item ->
-                                            add("%T(", resourceItemClass)
-                                            add("setOf(").addQualifiers(item).add("), ")
-                                            //file separator should be '/' on all platforms
-                                            add("\"${item.path.invariantSeparatorsPathString}\"") //todo: add module ID here
-                                            add("),\n")
-                                        }
-                                    }
-                                    add(")\n")
-                                }
-                            }
-                            .add(")")
-                            .build().toString()
-                    )
+                    .delegate("\nlazy·{ init_$resName() }")
                     .build()
             }
             typeObject.addProperties(properties)
         }.build()
         chunkFile.addType(objectSpec)
 
-        idToResources.keys.forEach { resName ->
+        idToResources.forEach { (resName, items) ->
             val accessor = PropertySpec.builder(resName, type.getClassName(), KModifier.INTERNAL)
                 .receiver(ClassName(packageName, "Res", type.typeName))
                 .addAnnotation(experimentalAnnotation)
                 .getter(FunSpec.getterBuilder().addStatement("return $chunkClassName.$resName").build())
                 .build()
             chunkFile.addProperty(accessor)
+
+            val initializer = FunSpec.builder("init_$resName")
+                .addModifiers(KModifier.PRIVATE)
+                .addAnnotation(experimentalAnnotation)
+                .returns(type.getClassName())
+                .addStatement(
+                    CodeBlock.builder()
+                        .add("return %T(\n", type.getClassName()).withIndent {
+                            add("\"${type}:${resName}\",")
+                            if (type == ResourceType.STRING) add(" \"$resName\",")
+                            withIndent {
+                                add("\nsetOf(\n").withIndent {
+                                    items.forEach { item ->
+                                        add("%T(", resourceItemClass)
+                                        add("setOf(").addQualifiers(item).add("), ")
+                                        //file separator should be '/' on all platforms
+                                        add("\"${item.path.invariantSeparatorsPathString}\"") //todo: add module ID here
+                                        add("),\n")
+                                    }
+                                }
+                                add(")\n")
+                            }
+                        }
+                        .add(")")
+                        .build().toString()
+                )
+                .build()
+            chunkFile.addFunction(initializer)
         }
     }.build()
 }

diff --git a/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/...ins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
@@ -299,7 +299,7 @@ class ResourcesTest : GradlePluginTestBase() {
     //https://github.com/JetBrains/compose-multiplatform/issues/4194
     //https://github.com/JetBrains/compose-multiplatform/issues/4285
     //
-    // 25_000 icons + 25_000 strings!!!
+    // 1500 icons + 1500*20 strings!!!
     @Test
     fun testHugeNumberOfResources(): Unit = with(
         //disable cache for the test because the generateResourceFiles task doesn't support it

diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Drawable0.kt b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Drawable0.kt
@@ -8,60 +8,77 @@ import org.jetbrains.compose.resources.ExperimentalResourceApi
 
 @ExperimentalResourceApi
 private object Drawable0 {
-  public val _3_strange_name: DrawableResource = org.jetbrains.compose.resources.DrawableResource(
-        "drawable:_3_strange_name",
-          setOf(
-            org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/3-strange-name.xml"),
-          )
-      )
+  public val _3_strange_name: DrawableResource by 
+      lazy { init__3_strange_name() }
 
-  public val camelCaseName: DrawableResource = org.jetbrains.compose.resources.DrawableResource(
-        "drawable:camelCaseName",
-          setOf(
-            org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/camelCaseName.xml"),
-          )
-      )
+  public val camelCaseName: DrawableResource by 
+      lazy { init_camelCaseName() }
 
-  public val vector: DrawableResource = org.jetbrains.compose.resources.DrawableResource(
-        "drawable:vector",
-          setOf(
+  public val vector: DrawableResource by 
+      lazy { init_vector() }
 
-          org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("ast"),
-          ), "drawable-ast/vector.xml"),
-
-          org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("au"),
-          org.jetbrains.compose.resources.RegionQualifier("US"), ), "drawable-au-rUS/vector.xml"),
-
-          org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.ThemeQualifier.DARK,
-          org.jetbrains.compose.resources.LanguageQualifier("ge"), ),
-          "drawable-dark-ge/vector.xml"),
-
-          org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"),
-          ), "drawable-en/vector.xml"),
-            org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"),
-          )
-      )
-
-  public val vector_2: DrawableResource = org.jetbrains.compose.resources.DrawableResource(
-        "drawable:vector_2",
-          setOf(
-            org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector_2.xml"),
-          )
-      )
+  public val vector_2: DrawableResource by 
+      lazy { init_vector_2() }
 }
 
 @ExperimentalResourceApi
 internal val Res.drawable._3_strange_name: DrawableResource
   get() = Drawable0._3_strange_name
 
+@ExperimentalResourceApi
+private fun init__3_strange_name(): DrawableResource =
+    org.jetbrains.compose.resources.DrawableResource(
+  "drawable:_3_strange_name",
+    setOf(
+      org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/3-strange-name.xml"),
+    )
+)
+
 @ExperimentalResourceApi
 internal val Res.drawable.camelCaseName: DrawableResource
   get() = Drawable0.camelCaseName
 
+@ExperimentalResourceApi
+private fun init_camelCaseName(): DrawableResource =
+    org.jetbrains.compose.resources.DrawableResource(
+  "drawable:camelCaseName",
+    setOf(
+      org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/camelCaseName.xml"),
+    )
+)
+
 @ExperimentalResourceApi
 internal val Res.drawable.vector: DrawableResource
   get() = Drawable0.vector
 
+@ExperimentalResourceApi
+private fun init_vector(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
+  "drawable:vector",
+    setOf(
+
+    org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("ast"),
+    ), "drawable-ast/vector.xml"),
+
+    org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("au"),
+    org.jetbrains.compose.resources.RegionQualifier("US"), ), "drawable-au-rUS/vector.xml"),
+
+    org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.ThemeQualifier.DARK,
+    org.jetbrains.compose.resources.LanguageQualifier("ge"), ), "drawable-dark-ge/vector.xml"),
+
+    org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"),
+    ), "drawable-en/vector.xml"),
+      org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"),
+    )
+)
+
 @ExperimentalResourceApi
 internal val Res.drawable.vector_2: DrawableResource
   get() = Drawable0.vector_2
+
+@ExperimentalResourceApi
+private fun init_vector_2(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
+  "drawable:vector_2",
+    setOf(
+      org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector_2.xml"),
+    )
+)
diff --git a/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Font0.kt b/gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Font0.kt
@@ -8,14 +8,18 @@ import org.jetbrains.compose.resources.FontResource
 
 @ExperimentalResourceApi
 private object Font0 {
-  public val emptyFont: FontResource = org.jetbrains.compose.resources.FontResource(
-        "font:emptyFont",
-          setOf(
-            org.jetbrains.compose.resources.ResourceItem(setOf(), "font/emptyFont.otf"),
-          )
-      )
+  public val emptyFont: FontResource by 
+      lazy { init_emptyFont() }
 }
 
 @ExperimentalResourceApi
 internal val Res.font.emptyFont: FontResource
   get() = Font0.emptyFont
+
+@ExperimentalResourceApi
+private fun init_emptyFont(): FontResource = org.jetbrains.compose.resources.FontResource(
+  "font:emptyFont",
+    setOf(
+      org.jetbrains.compose.resources.ResourceItem(setOf(), "font/emptyFont.otf"),
+    )
+)