A few small whitespace changes that improve the readability and consistency of the generated Kotlin files
Change-Id: I5f445e6cb700ab12607c03256441b02633521bf6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/197238
Reviewed-by: Jim Blackler <jimblackler@google.com>
Commit-Queue: Alex Benton <bentonian@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Alex Benton <bentonian@google.com>
Auto-Submit: Alex Benton <bentonian@google.com>
diff --git a/generator/templates/art/api_kotlin_constants.kt b/generator/templates/art/api_kotlin_constants.kt
index f32725a..2eed7fc 100644
--- a/generator/templates/art/api_kotlin_constants.kt
+++ b/generator/templates/art/api_kotlin_constants.kt
@@ -31,6 +31,6 @@
val UINT64_MAX = java.lang.Long.parseUnsignedLong("18446744073709551615")
val SIZE_MAX = UINT64_MAX
{% for constant in by_category['constant'] %}
- val {{ as_ktName(constant.name.SNAKE_CASE() ) }} = {{ constant.value }};
+ val {{ as_ktName(constant.name.SNAKE_CASE() ) }} = {{ constant.value }}
{% endfor %}
}
diff --git a/generator/templates/art/api_kotlin_enum.kt b/generator/templates/art/api_kotlin_enum.kt
index 65eafee..4a9c3b8 100644
--- a/generator/templates/art/api_kotlin_enum.kt
+++ b/generator/templates/art/api_kotlin_enum.kt
@@ -33,13 +33,14 @@
{% endif %}
companion object {
{% for value in enum.values %}
- val {{ as_ktName(value.name.CamelCase()) }} =
+ val {{ as_ktName(value.name.CamelCase()) }} ={{' '}}
{{- enum.name.CamelCase() }}({{ '{:#010x}'.format(value.value) }})
{% endfor %}
val names = mapOf(
{% for value in enum.values %}
{{ '{:#010x}'.format(value.value) }} to "{{ as_ktName(value.name.CamelCase()) }}",
- {% endfor %} )
+ {% endfor %}
+ )
}
override fun toString(): String = names[v]?:v.toString()
}
diff --git a/generator/templates/art/api_kotlin_function_pointer.kt b/generator/templates/art/api_kotlin_function_pointer.kt
index b79f4e7..b763a72 100644
--- a/generator/templates/art/api_kotlin_function_pointer.kt
+++ b/generator/templates/art/api_kotlin_function_pointer.kt
@@ -28,10 +28,10 @@
{% from 'art/api_kotlin_types.kt' import kotlin_declaration with context %}
fun interface {{ function_pointer.name.CamelCase() }} {
-@Suppress("INAPPLICABLE_JVM_NAME") //* Required for @JvmName on global function.
-@JvmName("callback") //* Required to access Inline Value Class parameters via JNI.
-fun callback(
- {%- for arg in filter_arguments(function_pointer.arguments) %}
+ @Suppress("INAPPLICABLE_JVM_NAME") //* Required for @JvmName on global function.
+ @JvmName("callback") //* Required to access Inline Value Class parameters via JNI.
+ fun callback(
+ {%- for arg in filter_arguments(function_pointer.arguments) -%}
{{ as_varName(arg.name) }}:{{ kotlin_declaration(arg) }},
{%- endfor -%});
}
diff --git a/generator/templates/art/api_kotlin_functions.kt b/generator/templates/art/api_kotlin_functions.kt
index 47f11ce..73cabe5 100644
--- a/generator/templates/art/api_kotlin_functions.kt
+++ b/generator/templates/art/api_kotlin_functions.kt
@@ -29,8 +29,7 @@
{% for function in by_category['function'] if include_method(function) %}
external fun {{ function.name.camelCase() }}(
- {%- for arg in function.arguments %}
- {{- as_varName(arg.name) }}:{{ kotlin_definition(arg) }},
- {%- endfor -%}):
- {{- kotlin_type_declaration(function.return_type) -}}
+ {%- for arg in function.arguments -%}
+ {{- as_varName(arg.name) }}: {{ kotlin_definition(arg) }},{{' '}}
+ {%- endfor %}): {{ kotlin_type_declaration(function.return_type) -}}
{% endfor %}
diff --git a/generator/templates/art/api_kotlin_object.kt b/generator/templates/art/api_kotlin_object.kt
index c84819c..fba4a52 100644
--- a/generator/templates/art/api_kotlin_object.kt
+++ b/generator/templates/art/api_kotlin_object.kt
@@ -31,19 +31,22 @@
class {{ obj.name.CamelCase() }}(val handle: Long): AutoCloseable {
{% for method in obj.methods if include_method(method) %}
- @JvmName("{{ method.name.camelCase() }}") external fun {{ method.name.camelCase() }}(
+
+ @JvmName("{{ method.name.camelCase() }}")
+ external fun {{ method.name.camelCase() }}(
//* TODO(b/341923892): rework async methods to use futures.
{%- for arg in filter_arguments(method.arguments) %}
- {{- as_varName(arg.name) }}: {{ kotlin_definition(arg) }},
- {%- endfor -%}):
- {{- kotlin_type_declaration(method.return_type) -}}
+ {{- as_varName(arg.name) }}: {{ kotlin_definition(arg) }},{{ ' ' }}
+ {%- endfor -%}): {{ kotlin_type_declaration(method.return_type) }}
{% if method.name.chunks[0] == 'get' and not method.arguments %}
//* For the Kotlin getter, strip word 'get' from name and convert the remainder to
//* camelCase() (lower case first word). E.g. "get foo bar" translated to fooBar.
{% set name = method.name.chunks[1] + method.name.chunks[2:] | map('title') | join %}
+
@get:JvmName("{{ name }}")
val {{ name }} get() = {{ method.name.camelCase() }}()
{% endif %}
{% endfor %}
+
external override fun close();
}
