github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Add a type name to the resource initializers (#4240) 

to avoid "Overload resolution ambiguity" for different resources with a
same name

https://github.com/JetBrains/compose-multiplatform/issues/4237
pull/4244/head
Konstantin 10 months ago committed by GitHub
parent
84e52986dc
commit
a6b8b50423
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 57 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt
  2. 84
      gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Res.kt
  3. 15
      gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/Res.kt

7
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt
Unescape View File

@ -160,6 +160,9 @@ internal fun getResFileSpec(
.forEach { addFunction(it) } .forEach { addFunction(it) }
}.build() }.build()
private fun getterName(resourceType: ResourceType, resourceName: String): String =
"get_${resourceType.typeName}_$resourceName"
private fun getResourceTypeObject(type: ResourceType, nameToResources: Map<String, List<ResourceItem>>) = private fun getResourceTypeObject(type: ResourceType, nameToResources: Map<String, List<ResourceItem>>) =
TypeSpec.objectBuilder(type.typeName).apply { TypeSpec.objectBuilder(type.typeName).apply {
nameToResources.keys nameToResources.keys
@ -167,7 +170,7 @@ private fun getResourceTypeObject(type: ResourceType, nameToResources: Map<Strin
addProperty( addProperty(
PropertySpec PropertySpec
.builder(name, type.getClassName()) .builder(name, type.getClassName())
.initializer("get_$name()") .initializer(getterName(type, name) + "()")
.build() .build()
) )
} }
@ -176,7 +179,7 @@ private fun getResourceTypeObject(type: ResourceType, nameToResources: Map<Strin
private fun getResourceInitializer(name: String, type: ResourceType, items: List<ResourceItem>): FunSpec { private fun getResourceInitializer(name: String, type: ResourceType, items: List<ResourceItem>): FunSpec {
val propertyTypeName = type.getClassName() val propertyTypeName = type.getClassName()
val resourceId = "${type}:${name}" val resourceId = "${type}:${name}"
return FunSpec.builder("get_$name") return FunSpec.builder(getterName(type, name))
.addModifiers(KModifier.PRIVATE) .addModifiers(KModifier.PRIVATE)
.returns(propertyTypeName) .returns(propertyTypeName)
.addStatement( .addStatement(

84
gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Res.kt
Unescape View File

@ -27,31 +27,31 @@ internal object Res {
public suspend fun readBytes(path: String): ByteArray = readResourceBytes(path) public suspend fun readBytes(path: String): ByteArray = readResourceBytes(path)
public object drawable { public object drawable {
public val _3_strange_name: DrawableResource = get__3_strange_name() public val _3_strange_name: DrawableResource = get_drawable__3_strange_name()
public val vector: DrawableResource = get_vector() public val vector: DrawableResource = get_drawable_vector()
public val vector_2: DrawableResource = get_vector_2() public val vector_2: DrawableResource = get_drawable_vector_2()
} }
public object string { public object string {
public val app_name: StringResource = get_app_name() public val app_name: StringResource = get_string_app_name()
public val hello: StringResource = get_hello() public val hello: StringResource = get_string_hello()
public val multi_line: StringResource = get_multi_line() public val multi_line: StringResource = get_string_multi_line()
public val str_arr: StringResource = get_str_arr() public val str_arr: StringResource = get_string_str_arr()
public val str_template: StringResource = get_str_template() public val str_template: StringResource = get_string_str_template()
} }
public object font { public object font {
public val emptyfont: FontResource = get_emptyfont() public val emptyfont: FontResource = get_font_emptyfont()
} }
} }
private fun get__3_strange_name(): DrawableResource = private fun get_drawable__3_strange_name(): DrawableResource =
org.jetbrains.compose.resources.DrawableResource( org.jetbrains.compose.resources.DrawableResource(
"drawable:_3_strange_name", "drawable:_3_strange_name",
setOf( setOf(
@ -59,65 +59,69 @@ private fun get__3_strange_name(): DrawableResource =
) )
) )
private fun get_vector(): DrawableResource = org.jetbrains.compose.resources.DrawableResource( private fun get_drawable_vector(): DrawableResource =
"drawable:vector", org.jetbrains.compose.resources.DrawableResource(
setOf( "drawable:vector",
setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("au"), 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.RegionQualifier("US"), ), "drawable-au-rUS/vector.xml"),
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.ThemeQualifier.DARK, 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.LanguageQualifier("ge"), ), "drawable-dark-ge/vector.xml"),
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"), org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"),
), "drawable-en/vector.xml"), ), "drawable-en/vector.xml"),
org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"), org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"),
)
) )
)
private fun get_vector_2(): DrawableResource = org.jetbrains.compose.resources.DrawableResource( private fun get_drawable_vector_2(): DrawableResource =
"drawable:vector_2", org.jetbrains.compose.resources.DrawableResource(
setOf( "drawable:vector_2",
org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector_2.xml"), setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector_2.xml"),
)
) )
)
private fun get_app_name(): StringResource = org.jetbrains.compose.resources.StringResource( private fun get_string_app_name(): StringResource = org.jetbrains.compose.resources.StringResource(
"string:app_name", "app_name", "string:app_name", "app_name",
setOf( setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"), org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
) )
) )
private fun get_hello(): StringResource = org.jetbrains.compose.resources.StringResource( private fun get_string_hello(): StringResource = org.jetbrains.compose.resources.StringResource(
"string:hello", "hello", "string:hello", "hello",
setOf( setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"), org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
) )
) )
private fun get_multi_line(): StringResource = org.jetbrains.compose.resources.StringResource( private fun get_string_multi_line(): StringResource =
"string:multi_line", "multi_line", org.jetbrains.compose.resources.StringResource(
setOf( "string:multi_line", "multi_line",
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"), setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
)
) )
)
private fun get_str_arr(): StringResource = org.jetbrains.compose.resources.StringResource( private fun get_string_str_arr(): StringResource = org.jetbrains.compose.resources.StringResource(
"string:str_arr", "str_arr", "string:str_arr", "str_arr",
setOf( setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"), org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
) )
) )
private fun get_str_template(): StringResource = org.jetbrains.compose.resources.StringResource( private fun get_string_str_template(): StringResource =
"string:str_template", "str_template", org.jetbrains.compose.resources.StringResource(
setOf( "string:str_template", "str_template",
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"), setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "values/strings.xml"),
)
) )
)
private fun get_emptyfont(): FontResource = org.jetbrains.compose.resources.FontResource( private fun get_font_emptyfont(): FontResource = org.jetbrains.compose.resources.FontResource(
"font:emptyfont", "font:emptyfont",
setOf( setOf(
org.jetbrains.compose.resources.ResourceItem(setOf(), "font/emptyFont.otf"), org.jetbrains.compose.resources.ResourceItem(setOf(), "font/emptyFont.otf"),

15
gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/Res.kt
Unescape View File

@ -25,13 +25,14 @@ internal object Res {
public suspend fun readBytes(path: String): ByteArray = readResourceBytes(path) public suspend fun readBytes(path: String): ByteArray = readResourceBytes(path)
public object drawable { public object drawable {
public val vector: DrawableResource = get_vector() public val vector: DrawableResource = get_drawable_vector()
} }
} }
private fun get_vector(): DrawableResource = org.jetbrains.compose.resources.DrawableResource( private fun get_drawable_vector(): DrawableResource =
"drawable:vector", org.jetbrains.compose.resources.DrawableResource(
setOf( "drawable:vector",
org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"), setOf(
) org.jetbrains.compose.resources.ResourceItem(setOf(), "drawable/vector.xml"),
) )
)
Write Preview
Loading…
Cancel
Save