1 files changed, 108 insertions, 32 deletions

diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
index 6a95d6a66d..7acfdc8861 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
@@ -1,32 +1,91 @@
 {#
 // Template to call into rust. Used in several places.
-// Variable names in `arg_list_decl` should match up with arg lists
+// Variable names in `arg_list` should match up with arg lists
 // passed to rust via `arg_list_lowered`
 #}
 
 {%- macro to_ffi_call(func) -%}
-    {%- match func.throws_type() %}
-    {%- when Some with (e) %}
-    rustCallWithError({{ e|type_name(ci) }})
-    {%- else %}
-    rustCall()
-    {%- endmatch %} { _status ->
-    _UniFFILib.INSTANCE.{{ func.ffi_func().name() }}({% call arg_list_lowered(func) -%} _status)
-}
-{%- endmacro -%}
+    {%- if func.takes_self() %}
+    callWithPointer {
+        {%- call to_raw_ffi_call(func) %}
+    }
+    {% else %}
+        {%- call to_raw_ffi_call(func) %}
+    {% endif %}
+{%- endmacro %}
 
-{%- macro to_ffi_call_with_prefix(prefix, func) %}
+{%- macro to_raw_ffi_call(func) -%}
     {%- match func.throws_type() %}
     {%- when Some with (e) %}
-    rustCallWithError({{ e|type_name(ci) }})
+    uniffiRustCallWithError({{ e|type_name(ci) }})
     {%- else %}
-    rustCall()
+    uniffiRustCall()
     {%- endmatch %} { _status ->
-    _UniFFILib.INSTANCE.{{ func.ffi_func().name() }}(
-        {{- prefix }},
-        {% call arg_list_lowered(func) %}
+    UniffiLib.INSTANCE.{{ func.ffi_func().name() }}(
+        {% if func.takes_self() %}it, {% endif -%}
+        {% call arg_list_lowered(func) -%}
         _status)
 }
+{%- endmacro -%}
+
+{%- macro func_decl(func_decl, callable, indent) %}
+    {%- call docstring(callable, indent) %}
+    {%- match callable.throws_type() -%}
+    {%-     when Some(throwable) %}
+    @Throws({{ throwable|type_name(ci) }}::class)
+    {%-     else -%}
+    {%- endmatch -%}
+    {%- if callable.is_async() %}
+    @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
+    {{ func_decl }} suspend fun {{ callable.name()|fn_name }}(
+        {%- call arg_list(callable, !callable.takes_self()) -%}
+    ){% match callable.return_type() %}{% when Some with (return_type) %} : {{ return_type|type_name(ci) }}{% when None %}{%- endmatch %} {
+        return {% call call_async(callable) %}
+    }
+    {%- else -%}
+    {{ func_decl }} fun {{ callable.name()|fn_name }}(
+        {%- call arg_list(callable, !callable.takes_self()) -%}
+    ){%- match callable.return_type() -%}
+    {%-         when Some with (return_type) -%}
+        : {{ return_type|type_name(ci) }} {
+            return {{ return_type|lift_fn }}({% call to_ffi_call(callable) %})
+    }
+    {%-         when None %}
+        = {% call to_ffi_call(callable) %}
+    {%-     endmatch %}
+    {% endif %}
+{% endmacro %}
+
+{%- macro call_async(callable) -%}
+    uniffiRustCallAsync(
+{%- if callable.takes_self() %}
+        callWithPointer { thisPtr ->
+            UniffiLib.INSTANCE.{{ callable.ffi_func().name() }}(
+                thisPtr,
+                {% call arg_list_lowered(callable) %}
+            )
+        },
+{%- else %}
+        UniffiLib.INSTANCE.{{ callable.ffi_func().name() }}({% call arg_list_lowered(callable) %}),
+{%- endif %}
+        {{ callable|async_poll(ci) }},
+        {{ callable|async_complete(ci) }},
+        {{ callable|async_free(ci) }},
+        // lift function
+        {%- match callable.return_type() %}
+        {%- when Some(return_type) %}
+        { {{ return_type|lift_fn }}(it) },
+        {%- when None %}
+        { Unit },
+        {% endmatch %}
+        // Error FFI converter
+        {%- match callable.throws_type() %}
+        {%- when Some(e) %}
+        {{ e|type_name(ci) }}.ErrorHandler,
+        {%- when None %}
+        UniffiNullRustCallStatusErrorHandler,
+        {%- endmatch %}
+    )
 {%- endmacro %}
 
 {%- macro arg_list_lowered(func) %}
@@ -37,37 +96,42 @@
 
 {#-
 // Arglist as used in kotlin declarations of methods, functions and constructors.
+// If is_decl, then default values be specified.
 // Note the var_name and type_name filters.
 -#}
 
-{% macro arg_list_decl(func) %}
-    {%- for arg in func.arguments() -%}
+{% macro arg_list(func, is_decl) %}
+{%- for arg in func.arguments() -%}
         {{ arg.name()|var_name }}: {{ arg|type_name(ci) }}
-        {%- match arg.default_value() %}
-        {%- when Some with(literal) %} = {{ literal|render_literal(arg, ci) }}
-        {%- else %}
-        {%- endmatch %}
-        {%- if !loop.last %}, {% endif -%}
-    {%- endfor %}
+{%-     if is_decl %}
+{%-         match arg.default_value() %}
+{%-             when Some with(literal) %} = {{ literal|render_literal(arg, ci) }}
+{%-             else %}
+{%-         endmatch %}
+{%-     endif %}
+{%-     if !loop.last %}, {% endif -%}
+{%- endfor %}
 {%- endmacro %}
 
-{% macro arg_list_protocol(func) %}
-    {%- for arg in func.arguments() -%}
-        {{ arg.name()|var_name }}: {{ arg|type_name(ci) }}
-        {%- if !loop.last %}, {% endif -%}
-    {%- endfor %}
-{%- endmacro %}
 {#-
-// Arglist as used in the _UniFFILib function declarations.
+// Arglist as used in the UniffiLib function declarations.
 // Note unfiltered name but ffi_type_name filters.
 -#}
 {%- macro arg_list_ffi_decl(func) %}
     {%- for arg in func.arguments() %}
         {{- arg.name()|var_name }}: {{ arg.type_().borrow()|ffi_type_name_by_value -}},
     {%- endfor %}
-    {%- if func.has_rust_call_status_arg() %}_uniffi_out_err: RustCallStatus, {% endif %}
+    {%- if func.has_rust_call_status_arg() %}uniffi_out_err: UniffiRustCallStatus, {% endif %}
 {%- endmacro -%}
 
+{% macro field_name(field, field_num) %}
+{%- if field.name().is_empty() -%}
+v{{- field_num -}}
+{%- else -%}
+{{ field.name()|var_name }}
+{%- endif -%}
+{%- endmacro %}
+
 // Macro for destroying fields
 {%- macro destroy_fields(member) %}
     Disposable.destroy(
@@ -75,3 +139,15 @@
         this.{{ field.name()|var_name }}{%- if !loop.last %}, {% endif -%}
     {% endfor -%})
 {%- endmacro -%}
+
+{%- macro docstring_value(maybe_docstring, indent_spaces) %}
+{%- match maybe_docstring %}
+{%- when Some(docstring) %}
+{{ docstring|docstring(indent_spaces) }}
+{%- else %}
+{%- endmatch %}
+{%- endmacro %}
+
+{%- macro docstring(defn, indent_spaces) %}
+{%- call docstring_value(defn.docstring(), indent_spaces) %}
+{%- endmacro %}