diff --git a/codegen/lib/templates/kotlin/ios_parameter_access.erb b/codegen/lib/templates/kotlin/ios_parameter_access.erb index 740b45c4708..b16ce477107 100644 --- a/codegen/lib/templates/kotlin/ios_parameter_access.erb +++ b/codegen/lib/templates/kotlin/ios_parameter_access.erb @@ -5,23 +5,23 @@ method.parameters.each do |param| -%> <% if param.type.name == :data -%> <% if param.type.is_nullable -%> -<%= ' ' * more_index %> val <%= param.name %>Data = if (<%= param.name %> == null) { +<%= ' ' * more_index %> val <%= KotlinHelper.fix_name(param.name) %>Data = if (<%= KotlinHelper.fix_name(param.name) %> == null) { <%= ' ' * more_index %> null <%= ' ' * more_index %> } else { -<%= ' ' * more_index %> TWDataCreateWithBytes(<%= param.name %>.toUByteArray().toCValues(), <%= param.name %>.size.toULong()) +<%= ' ' * more_index %> TWDataCreateWithBytes(<%= KotlinHelper.fix_name(param.name) %>.toUByteArray().toCValues(), <%= KotlinHelper.fix_name(param.name) %>.size.toULong()) <%= ' ' * more_index %> } <% else -%> -<%= ' ' * more_index %> val <%= param.name %>Data = TWDataCreateWithBytes(<%= param.name %>.toUByteArray().toCValues(), <%= param.name %>.size.toULong()) +<%= ' ' * more_index %> val <%= KotlinHelper.fix_name(param.name) %>Data = TWDataCreateWithBytes(<%= KotlinHelper.fix_name(param.name) %>.toUByteArray().toCValues(), <%= KotlinHelper.fix_name(param.name) %>.size.toULong()) <% end -%> <% elsif param.type.name == :string -%> <% if param.type.is_nullable -%> -<%= ' ' * more_index %> val <%= param.name %>String = if (<%= param.name %> == null) { +<%= ' ' * more_index %> val <%= KotlinHelper.fix_name(param.name) %>String = if (<%= KotlinHelper.fix_name(param.name) %> == null) { <%= ' ' * more_index %> null <%= ' ' * more_index %> } else { -<%= ' ' * more_index %> TWStringCreateWithUTF8Bytes(<%= param.name %>) +<%= ' ' * more_index %> TWStringCreateWithUTF8Bytes(<%= KotlinHelper.fix_name(param.name) %>) <%= ' ' * more_index %> } <% else -%> -<%= ' ' * more_index %> val <%= param.name %>String = TWStringCreateWithUTF8Bytes(<%= param.name %>) +<%= ' ' * more_index %> val <%= KotlinHelper.fix_name(param.name) %>String = TWStringCreateWithUTF8Bytes(<%= KotlinHelper.fix_name(param.name) %>) <% end -%> <% end -%> <% end -%> diff --git a/codegen/lib/templates/kotlin/ios_parameter_release.erb b/codegen/lib/templates/kotlin/ios_parameter_release.erb index 2a1a3e2c5b2..8f90bb6aeaf 100644 --- a/codegen/lib/templates/kotlin/ios_parameter_release.erb +++ b/codegen/lib/templates/kotlin/ios_parameter_release.erb @@ -5,19 +5,19 @@ method.parameters.each do |param| -%> <% if param.type.name == :data -%> <% if param.type.is_nullable -%> -<%= ' ' * more_index %> if (<%= param.name %>Data != null) { -<%= ' ' * more_index %> TWDataDelete(<%= param.name %>Data) +<%= ' ' * more_index %> if (<%= KotlinHelper.fix_name(param.name) %>Data != null) { +<%= ' ' * more_index %> TWDataDelete(<%= KotlinHelper.fix_name(param.name) %>Data) <%= ' ' * more_index %> } <% else -%> -<%= ' ' * more_index %> TWDataDelete(<%= param.name %>Data) +<%= ' ' * more_index %> TWDataDelete(<%= KotlinHelper.fix_name(param.name) %>Data) <% end -%> <% elsif param.type.name == :string -%> <% if param.type.is_nullable -%> -<%= ' ' * more_index %> if (<%= param.name %>String != null) { -<%= ' ' * more_index %> TWStringDelete(<%= param.name %>String) +<%= ' ' * more_index %> if (<%= KotlinHelper.fix_name(param.name) %>String != null) { +<%= ' ' * more_index %> TWStringDelete(<%= KotlinHelper.fix_name(param.name) %>String) <%= ' ' * more_index %> } <% else -%> -<%= ' ' * more_index %> TWStringDelete(<%= param.name %>String) +<%= ' ' * more_index %> TWStringDelete(<%= KotlinHelper.fix_name(param.name) %>String) <% end -%> <% end -%> <% end -%>