From 4edef63643b1f702e22624ffbe63553f8cc48f97 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:01:35 -0400 Subject: [PATCH 01/20] fix ImpliciSamInstances lint --- packages/pigeon/lib/src/kotlin/templates.dart | 13 ++++--------- .../webviewflutter/AndroidWebkitLibrary.g.kt | 9 +++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index af9f4b357ead..32257fc1297f 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -48,6 +48,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) + private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false @@ -63,10 +64,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene } init { - handler.postDelayed( - { releaseAllFinalizedInstances() }, - clearFinalizedWeakReferencesInterval - ) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } companion object { @@ -167,7 +165,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) hasFinalizationListenerStopped = true } @@ -206,10 +204,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene finalizationListener.onFinalize(identifier) } } - handler.postDelayed( - { releaseAllFinalizedInstances() }, - clearFinalizedWeakReferencesInterval - ) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } private fun addInstance(instance: Any, identifier: Long) { diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt index 92cbf74aaa17..9aa63b857858 100644 --- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt +++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt @@ -77,6 +77,7 @@ class AndroidWebkitLibraryPigeonInstanceManager( private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) + private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false @@ -86,13 +87,13 @@ class AndroidWebkitLibraryPigeonInstanceManager( */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) field = value releaseAllFinalizedInstances() } init { - handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } companion object { @@ -198,7 +199,7 @@ class AndroidWebkitLibraryPigeonInstanceManager( * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) hasFinalizationListenerStopped = true } @@ -238,7 +239,7 @@ class AndroidWebkitLibraryPigeonInstanceManager( finalizationListener.onFinalize(identifier) } } - handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } private fun addInstance(instance: Any, identifier: Long) { From 7242a43f8821e6d0c00826939b5e598c562e872e Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:11:33 -0400 Subject: [PATCH 02/20] update runnable and improve docs --- packages/pigeon/lib/src/kotlin/templates.dart | 4 +++- .../com/example/test_plugin/ProxyApiTests.gen.kt | 11 +++++++---- .../plugins/webviewflutter/AndroidWebkitLibrary.g.kt | 9 ++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index 32257fc1297f..8891b96a5f4a 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -134,7 +134,9 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene /** * Adds a new unique instance that was instantiated from the host platform. * - * [identifier] must be >= 0 and unique. + * If the manager contains [instance], this returns the corresponding identifier. If the + * manager does not contain [instance], this adds the instance and returns a unique + * identifier for that [instance]. */ fun addHostCreatedInstance(instance: Any): Long { logWarningIfFinalizationListenerHasStopped() diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 88c43a433ea2..1deedeffba81 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -78,6 +78,7 @@ class ProxyApiTestsPigeonInstanceManager( private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) + private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false @@ -93,7 +94,7 @@ class ProxyApiTestsPigeonInstanceManager( } init { - handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } companion object { @@ -162,7 +163,9 @@ class ProxyApiTestsPigeonInstanceManager( /** * Adds a new unique instance that was instantiated from the host platform. * - * [identifier] must be >= 0 and unique. + * If the manager contains [instance], this returns the corresponding identifier. If the manager + * does not contain [instance], this adds the instance and returns a unique identifier for that + * [instance]. */ fun addHostCreatedInstance(instance: Any): Long { logWarningIfFinalizationListenerHasStopped() @@ -195,7 +198,7 @@ class ProxyApiTestsPigeonInstanceManager( * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) hasFinalizationListenerStopped = true } @@ -235,7 +238,7 @@ class ProxyApiTestsPigeonInstanceManager( finalizationListener.onFinalize(identifier) } } - handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) + handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) } private fun addInstance(instance: Any, identifier: Long) { diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt index 9aa63b857858..92cbf74aaa17 100644 --- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt +++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/AndroidWebkitLibrary.g.kt @@ -77,7 +77,6 @@ class AndroidWebkitLibraryPigeonInstanceManager( private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) - private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false @@ -87,13 +86,13 @@ class AndroidWebkitLibraryPigeonInstanceManager( */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) + handler.removeCallbacks { this.releaseAllFinalizedInstances() } field = value releaseAllFinalizedInstances() } init { - handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) + handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) } companion object { @@ -199,7 +198,7 @@ class AndroidWebkitLibraryPigeonInstanceManager( * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) + handler.removeCallbacks { this.releaseAllFinalizedInstances() } hasFinalizationListenerStopped = true } @@ -239,7 +238,7 @@ class AndroidWebkitLibraryPigeonInstanceManager( finalizationListener.onFinalize(identifier) } } - handler.postDelayed(releaseAllFinalizedInstancesRunnable, clearFinalizedWeakReferencesInterval) + handler.postDelayed({ releaseAllFinalizedInstances() }, clearFinalizedWeakReferencesInterval) } private fun addInstance(instance: Any, identifier: Long) { From 23b0dfc6c8a2c6468fbeff4787bc917cef5db1d5 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:35:12 -0400 Subject: [PATCH 03/20] add test and fix last one --- packages/pigeon/lib/src/kotlin/templates.dart | 2 +- .../example/test_plugin/ProxyApiTests.gen.kt | 2 +- .../pigeon/test/kotlin/proxy_api_test.dart | 78 +++++++++++++++++++ 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index 8891b96a5f4a..0d87bcbdc7a7 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -58,7 +58,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) field = value releaseAllFinalizedInstances() } diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 1deedeffba81..7b775b403636 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -88,7 +88,7 @@ class ProxyApiTestsPigeonInstanceManager( */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks { this.releaseAllFinalizedInstances() } + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) field = value releaseAllFinalizedInstances() } diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index fc88034531d9..44b87a24d867 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -999,6 +999,84 @@ void main() { ); }); }); + + group('InstanceManager', () { + test( + 'InstanceManager passes runnable field and not a new runnable instance', + () { + final Root root = Root( + apis: [ + AstProxyApi( + name: 'Api', + constructors: [], + fields: [], + methods: [], + ), + ], + classes: [], + enums: [], + ); + final StringBuffer sink = StringBuffer(); + const KotlinGenerator generator = KotlinGenerator(); + generator.generate( + const InternalKotlinOptions(kotlinOut: ''), + root, + sink, + dartPackageName: DEFAULT_PACKAGE_NAME, + ); + final String code = sink.toString(); + final String collapsedCode = _collapseNewlineAndIndentation(code); + + expect( + code, + contains( + 'handler.removeCallbacks(releaseAllFinalizedInstancesRunnable)', + ), + ); + expect( + code, + isNot(contains('{ this.releaseAllFinalizedInstances() }')), + ); + }); + + test( + 'InstanceManager passes runnable field and not a new runnable instance', + () { + final Root root = Root( + apis: [ + AstProxyApi( + name: 'Api', + constructors: [], + fields: [], + methods: [], + ), + ], + classes: [], + enums: [], + ); + final StringBuffer sink = StringBuffer(); + const KotlinGenerator generator = KotlinGenerator(); + generator.generate( + const InternalKotlinOptions(kotlinOut: ''), + root, + sink, + dartPackageName: DEFAULT_PACKAGE_NAME, + ); + final String code = sink.toString(); + final String collapsedCode = _collapseNewlineAndIndentation(code); + + expect( + code, + contains( + 'handler.removeCallbacks(releaseAllFinalizedInstancesRunnable)', + ), + ); + expect( + code, + isNot(contains('{ this.releaseAllFinalizedInstances() }')), + ); + }); + }); }); } From fb15c2e89eee38341326a5c3f0a4ca7ec434af46 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:19:25 -0400 Subject: [PATCH 04/20] version bump --- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/lib/src/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index be111f4d5029..8c69aa182acc 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 25.3.1 + +* [kotlin] Fixes Kotlin InstanceManager not properly removing callbacks from handler. + ## 25.3.0 * [swift] Adds equality methods to generated data classes. diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index f23501554612..529d9a712d12 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '25.3.0'; +const String pigeonVersion = '25.3.1'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index f1642d77176a..fd03c48cee47 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 25.3.0 # This must match the version in lib/src/generator_tools.dart +version: 25.3.1 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.4.0 From fde8ab1e9c886b1f755366ff6b9122a6ed81244c Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:21:29 -0400 Subject: [PATCH 05/20] fix test --- .../pigeon/test/kotlin/proxy_api_test.dart | 37 ++----------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index 44b87a24d867..198f6561428e 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1033,47 +1033,16 @@ void main() { 'handler.removeCallbacks(releaseAllFinalizedInstancesRunnable)', ), ); - expect( - code, - isNot(contains('{ this.releaseAllFinalizedInstances() }')), - ); - }); - - test( - 'InstanceManager passes runnable field and not a new runnable instance', - () { - final Root root = Root( - apis: [ - AstProxyApi( - name: 'Api', - constructors: [], - fields: [], - methods: [], - ), - ], - classes: [], - enums: [], - ); - final StringBuffer sink = StringBuffer(); - const KotlinGenerator generator = KotlinGenerator(); - generator.generate( - const InternalKotlinOptions(kotlinOut: ''), - root, - sink, - dartPackageName: DEFAULT_PACKAGE_NAME, - ); - final String code = sink.toString(); - final String collapsedCode = _collapseNewlineAndIndentation(code); - expect( code, contains( - 'handler.removeCallbacks(releaseAllFinalizedInstancesRunnable)', + 'handler.postDelayed(releaseAllFinalizedInstancesRunnable', ), ); + expect( code, - isNot(contains('{ this.releaseAllFinalizedInstances() }')), + isNot(contains('({ this.releaseAllFinalizedInstances() })')), ); }); }); From 8ec0a8e29102cc1d8dc459a80eda21e6445caeaa Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:32:07 -0400 Subject: [PATCH 06/20] better test --- packages/pigeon/test/kotlin/proxy_api_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index 198f6561428e..8e2f1723cf90 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1041,8 +1041,8 @@ void main() { ); expect( - code, - isNot(contains('({ this.releaseAllFinalizedInstances() })')), + 'this.releaseAllFinalizedInstances()'.allMatches(code).length, + 1, ); }); }); From 2490fc475a60c45157f3ec437c0cc30eac43f67f Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:33:17 -0400 Subject: [PATCH 07/20] another test --- packages/pigeon/test/kotlin/proxy_api_test.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index 8e2f1723cf90..80def5025fa3 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1040,6 +1040,12 @@ void main() { ), ); + expect( + code, + contains( + 'private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() }', + ), + ); expect( 'this.releaseAllFinalizedInstances()'.allMatches(code).length, 1, From 8e4a6cb78fe4a4cfb8899bae34a078c318104cf5 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:22:57 -0400 Subject: [PATCH 08/20] unused line --- packages/pigeon/test/kotlin/proxy_api_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index 80def5025fa3..ebba673d3b9b 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1025,7 +1025,6 @@ void main() { dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); - final String collapsedCode = _collapseNewlineAndIndentation(code); expect( code, From 45619f73539fd3c2c4c9d84a6aa8fe509937d255 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Sun, 13 Apr 2025 18:19:46 -0400 Subject: [PATCH 09/20] test it on ci --- packages/pigeon/lib/src/kotlin/templates.dart | 2 +- .../pigeon/platform_tests/test_plugin/android/build.gradle | 1 + .../main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt | 2 +- .../test_plugin/example/android/app/build.gradle | 4 ++++ packages/pigeon/test/kotlin/proxy_api_test.dart | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index 0d87bcbdc7a7..5e0901f7741c 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -167,7 +167,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) + handler.removeCallbacks(::releaseAllFinalizedInstances) hasFinalizationListenerStopped = true } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 2789471f520d..d5049cbd6876 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -61,6 +61,7 @@ android { lintOptions { checkAllWarnings true warningsAsErrors true + enable 'ImplicitSamInstance' disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' } diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 7b775b403636..427ca0b4b0f1 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -88,7 +88,7 @@ class ProxyApiTestsPigeonInstanceManager( */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) + handler.removeCallbacks(::releaseAllFinalizedInstances) field = value releaseAllFinalizedInstances() } diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle index f204b4ade53d..ff34eaafcc7f 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle @@ -51,6 +51,10 @@ android { versionName flutterVersionName } + lint { + error 'ImplicitSamInstance' + } + buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index ebba673d3b9b..e4bfe8c75452 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1050,7 +1050,7 @@ void main() { 1, ); }); - }); + }, skip: true); }); } From 5eb461cdc5388aae3117312b50e0faa0c59a7fba Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Sun, 13 Apr 2025 18:22:04 -0400 Subject: [PATCH 10/20] try with just += --- packages/pigeon/platform_tests/test_plugin/android/build.gradle | 2 +- .../platform_tests/test_plugin/example/android/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index d5049cbd6876..1ce57c0e1f81 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -61,7 +61,7 @@ android { lintOptions { checkAllWarnings true warningsAsErrors true - enable 'ImplicitSamInstance' + enable += 'ImplicitSamInstance' disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' } diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle index ff34eaafcc7f..791a9b86242d 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle @@ -52,7 +52,7 @@ android { } lint { - error 'ImplicitSamInstance' + error += 'ImplicitSamInstance' } buildTypes { From 9b9144495025f68364a061ca888fcede7e820a30 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Sun, 13 Apr 2025 18:35:56 -0400 Subject: [PATCH 11/20] regenerate --- .../main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 427ca0b4b0f1..43dbfe3b082c 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -88,7 +88,7 @@ class ProxyApiTestsPigeonInstanceManager( */ var clearFinalizedWeakReferencesInterval: Long = 3000 set(value) { - handler.removeCallbacks(::releaseAllFinalizedInstances) + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) field = value releaseAllFinalizedInstances() } @@ -198,7 +198,7 @@ class ProxyApiTestsPigeonInstanceManager( * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) + handler.removeCallbacks(::releaseAllFinalizedInstances) hasFinalizationListenerStopped = true } From ccce7679317d6ea967427468ec17f07a290c2814 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Sun, 13 Apr 2025 20:11:04 -0400 Subject: [PATCH 12/20] revert --- packages/pigeon/lib/src/kotlin/templates.dart | 2 +- .../pigeon/platform_tests/test_plugin/android/build.gradle | 1 - .../main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt | 2 +- .../test_plugin/example/android/app/build.gradle | 4 ---- packages/pigeon/test/kotlin/proxy_api_test.dart | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index 5e0901f7741c..0d87bcbdc7a7 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -167,7 +167,7 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks(::releaseAllFinalizedInstances) + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) hasFinalizationListenerStopped = true } diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 1ce57c0e1f81..2789471f520d 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -61,7 +61,6 @@ android { lintOptions { checkAllWarnings true warningsAsErrors true - enable += 'ImplicitSamInstance' disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' } diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 43dbfe3b082c..7b775b403636 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -198,7 +198,7 @@ class ProxyApiTestsPigeonInstanceManager( * longer be called and methods will log a warning. */ fun stopFinalizationListener() { - handler.removeCallbacks(::releaseAllFinalizedInstances) + handler.removeCallbacks(releaseAllFinalizedInstancesRunnable) hasFinalizationListenerStopped = true } diff --git a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle index 791a9b86242d..f204b4ade53d 100644 --- a/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/example/android/app/build.gradle @@ -51,10 +51,6 @@ android { versionName flutterVersionName } - lint { - error += 'ImplicitSamInstance' - } - buildTypes { release { // TODO: Add your own signing config for the release build. diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index e4bfe8c75452..ebba673d3b9b 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1050,7 +1050,7 @@ void main() { 1, ); }); - }, skip: true); + }); }); } From e557875a90f48a3651230ff7c3a083ceb94a826c Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 16:32:37 -0400 Subject: [PATCH 13/20] add failing lint --- .../AdsManagerLoadedEventProxyApi.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt index 1374ecde4a12..a8fcb268592c 100644 --- a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt +++ b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt @@ -4,6 +4,8 @@ package dev.flutter.packages.interactive_media_ads +import android.os.Handler +import android.os.Looper import com.google.ads.interactivemedia.v3.api.AdsManager import com.google.ads.interactivemedia.v3.api.AdsManagerLoadedEvent @@ -16,6 +18,12 @@ import com.google.ads.interactivemedia.v3.api.AdsManagerLoadedEvent class AdsManagerLoadedEventProxyApi(override val pigeonRegistrar: ProxyApiRegistrar) : PigeonApiAdsManagerLoadedEvent(pigeonRegistrar) { override fun manager(pigeon_instance: AdsManagerLoadedEvent): AdsManager { + val handler = Handler(Looper.getMainLooper()) + handler.post(::aMethod) return pigeon_instance.adsManager } + + fun aMethod() { + + } } From 753245554113626fcb849272aa7af58c93c858b8 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:17:44 -0400 Subject: [PATCH 14/20] run lint on generated kotlin --- .../AdsManagerLoadedEventProxyApi.kt | 8 --- packages/pigeon/tool/shared/test_suites.dart | 54 +++++++++++++------ 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt index a8fcb268592c..1374ecde4a12 100644 --- a/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt +++ b/packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsManagerLoadedEventProxyApi.kt @@ -4,8 +4,6 @@ package dev.flutter.packages.interactive_media_ads -import android.os.Handler -import android.os.Looper import com.google.ads.interactivemedia.v3.api.AdsManager import com.google.ads.interactivemedia.v3.api.AdsManagerLoadedEvent @@ -18,12 +16,6 @@ import com.google.ads.interactivemedia.v3.api.AdsManagerLoadedEvent class AdsManagerLoadedEventProxyApi(override val pigeonRegistrar: ProxyApiRegistrar) : PigeonApiAdsManagerLoadedEvent(pigeonRegistrar) { override fun manager(pigeon_instance: AdsManagerLoadedEvent): AdsManager { - val handler = Handler(Looper.getMainLooper()) - handler.post(::aMethod) return pigeon_instance.adsManager } - - fun aMethod() { - - } } diff --git a/packages/pigeon/tool/shared/test_suites.dart b/packages/pigeon/tool/shared/test_suites.dart index fb70cbea0eb1..a16afe0c2e78 100644 --- a/packages/pigeon/tool/shared/test_suites.dart +++ b/packages/pigeon/tool/shared/test_suites.dart @@ -16,9 +16,12 @@ import 'process_utils.dart'; const int _noDeviceAvailableExitCode = 100; -const String _testPluginRelativePath = 'platform_tests/test_plugin'; +const String _testPluginName = 'test_plugin'; +const String _alternateLanguageTestPluginName = + 'alternate_language_test_plugin'; +const String _testPluginRelativePath = 'platform_tests/$_testPluginName'; const String _alternateLanguageTestPluginRelativePath = - 'platform_tests/alternate_language_test_plugin'; + 'platform_tests/$_alternateLanguageTestPluginName'; const String _integrationTestFileRelativePath = 'integration_test/test.dart'; /// Information about a test suite. @@ -38,6 +41,7 @@ const String androidJavaUnitTests = 'android_java_unittests'; const String androidJavaLint = 'android_java_lint'; const String androidJavaIntegrationTests = 'android_java_integration_tests'; const String androidKotlinUnitTests = 'android_kotlin_unittests'; +const String androidKotlinLint = 'android_kotlin_lint'; const String androidKotlinIntegrationTests = 'android_kotlin_integration_tests'; const String iOSObjCUnitTests = 'ios_objc_unittests'; const String iOSObjCIntegrationTests = 'ios_objc_integration_tests'; @@ -72,6 +76,9 @@ const Map testSuites = { androidKotlinUnitTests: TestInfo( function: _runAndroidKotlinUnitTests, description: 'Unit tests on generated Kotlin code.'), + androidKotlinLint: TestInfo( + function: _runAndroidKotlinLint, + description: 'Lint generated Kotlin code.'), androidKotlinIntegrationTests: TestInfo( function: _runAndroidKotlinIntegrationTests, description: 'Integration tests on generated Kotlin code.'), @@ -123,26 +130,23 @@ Future _runAndroidJavaIntegrationTests({bool ciMode = false}) async { } Future _runAndroidJavaLint({bool ciMode = false}) async { - const String examplePath = - './$_alternateLanguageTestPluginRelativePath/example'; - const String androidProjectPath = '$examplePath/android'; - final File gradleFile = File(p.join(androidProjectPath, 'gradlew')); - if (!gradleFile.existsSync()) { - final int compileCode = await runFlutterBuild(examplePath, 'apk', - flags: ['--config-only']); - if (compileCode != 0) { - return compileCode; - } - } - - return runGradleBuild( - androidProjectPath, 'alternate_language_test_plugin:lintDebug'); + return _runAndroidLint( + testPluginName: _alternateLanguageTestPluginName, + testPluginPath: _alternateLanguageTestPluginRelativePath, + ); } Future _runAndroidKotlinUnitTests({bool ciMode = false}) async { return _runAndroidUnitTests(_testPluginRelativePath); } +Future _runAndroidKotlinLint({bool ciMode = false}) async { + return _runAndroidLint( + testPluginName: _testPluginName, + testPluginPath: _testPluginRelativePath, + ); +} + Future _runAndroidUnitTests(String testPluginPath) async { final String examplePath = './$testPluginPath/example'; final String androidProjectPath = '$examplePath/android'; @@ -157,6 +161,24 @@ Future _runAndroidUnitTests(String testPluginPath) async { return runGradleBuild(androidProjectPath, 'testDebugUnitTest'); } +Future _runAndroidLint({ + required String testPluginName, + required String testPluginPath, +}) async { + final String examplePath = './$testPluginPath/example'; + final String androidProjectPath = '$examplePath/android'; + final File gradleFile = File(p.join(androidProjectPath, 'gradlew')); + if (!gradleFile.existsSync()) { + final int compileCode = await runFlutterBuild(examplePath, 'apk', + flags: ['--config-only']); + if (compileCode != 0) { + return compileCode; + } + } + + return runGradleBuild(androidProjectPath, '$testPluginName:lintDebug'); +} + Future _runAndroidKotlinIntegrationTests({bool ciMode = false}) async { return _runMobileIntegrationTests('Android', _testPluginRelativePath); } From aea915bc8ad4706f43204009eab615ea529ebec3 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:14:59 -0400 Subject: [PATCH 15/20] fix lint errors --- .../EventChannelMessages.g.kt | 55 +- .../flutter/pigeon_example_app/Messages.g.kt | 99 +-- .../lib/src/kotlin/kotlin_generator.dart | 84 ++- packages/pigeon/lib/src/kotlin/templates.dart | 4 +- .../test_plugin/android/build.gradle | 2 +- .../com/example/test_plugin/CoreTests.gen.kt | 703 +++++++++--------- .../test_plugin/EventChannelTests.gen.kt | 73 +- .../example/test_plugin/ProxyApiTests.gen.kt | 369 ++++----- .../pigeon/test/kotlin/proxy_api_test.dart | 5 +- 9 files changed, 718 insertions(+), 676 deletions(-) diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt index 3bc2680f8885..c9aee7c42999 100644 --- a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt +++ b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt @@ -12,33 +12,32 @@ import io.flutter.plugin.common.StandardMethodCodec import java.io.ByteArrayOutputStream import java.nio.ByteBuffer -private fun deepEqualsEventChannelMessages(a: Any?, b: Any?): Boolean { - if (a is ByteArray && b is ByteArray) { - return a.contentEquals(b) - } - if (a is IntArray && b is IntArray) { - return a.contentEquals(b) - } - if (a is LongArray && b is LongArray) { - return a.contentEquals(b) - } - if (a is DoubleArray && b is DoubleArray) { - return a.contentEquals(b) - } - if (a is Array<*> && b is Array<*>) { - return a.size == b.size && a.indices.all { deepEqualsEventChannelMessages(a[it], b[it]) } - } - if (a is List<*> && b is List<*>) { - return a.size == b.size && a.indices.all { deepEqualsEventChannelMessages(a[it], b[it]) } - } - if (a is Map<*, *> && b is Map<*, *>) { - return a.size == b.size && - a.all { - (b as Map).containsKey(it.key) && - deepEqualsEventChannelMessages(it.value, b[it.key]) - } +private object EventChannelMessagesPigeonUtils { + fun deepEquals(a: Any?, b: Any?): Boolean { + if (a is ByteArray && b is ByteArray) { + return a.contentEquals(b) + } + if (a is IntArray && b is IntArray) { + return a.contentEquals(b) + } + if (a is LongArray && b is LongArray) { + return a.contentEquals(b) + } + if (a is DoubleArray && b is DoubleArray) { + return a.contentEquals(b) + } + if (a is Array<*> && b is Array<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is List<*> && b is List<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is Map<*, *> && b is Map<*, *>) { + return a.size == b.size && + a.all { (b as Map).containsKey(it.key) && deepEquals(it.value, b[it.key]) } + } + return a == b } - return a == b } /** @@ -68,7 +67,7 @@ data class IntEvent(val data: Long) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelMessages(toList(), other.toList()) + return EventChannelMessagesPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -96,7 +95,7 @@ data class StringEvent(val data: String) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelMessages(toList(), other.toList()) + return EventChannelMessagesPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() diff --git a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt index 82a8666b6ba1..589faae8be25 100644 --- a/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt +++ b/packages/pigeon/example/app/android/app/src/main/kotlin/dev/flutter/pigeon_example_app/Messages.g.kt @@ -13,24 +13,53 @@ import io.flutter.plugin.common.StandardMessageCodec import java.io.ByteArrayOutputStream import java.nio.ByteBuffer -private fun wrapResult(result: Any?): List { - return listOf(result) -} +private object MessagesPigeonUtils { -private fun wrapError(exception: Throwable): List { - return if (exception is FlutterError) { - listOf(exception.code, exception.message, exception.details) - } else { - listOf( - exception.javaClass.simpleName, - exception.toString(), - "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + fun createConnectionError(channelName: String): FlutterError { + return FlutterError( + "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + } + + fun wrapResult(result: Any?): List { + return listOf(result) + } + + fun wrapError(exception: Throwable): List { + return if (exception is FlutterError) { + listOf(exception.code, exception.message, exception.details) + } else { + listOf( + exception.javaClass.simpleName, + exception.toString(), + "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + } } -} -private fun createConnectionError(channelName: String): FlutterError { - return FlutterError( - "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + fun deepEquals(a: Any?, b: Any?): Boolean { + if (a is ByteArray && b is ByteArray) { + return a.contentEquals(b) + } + if (a is IntArray && b is IntArray) { + return a.contentEquals(b) + } + if (a is LongArray && b is LongArray) { + return a.contentEquals(b) + } + if (a is DoubleArray && b is DoubleArray) { + return a.contentEquals(b) + } + if (a is Array<*> && b is Array<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is List<*> && b is List<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is Map<*, *> && b is Map<*, *>) { + return a.size == b.size && + a.all { (b as Map).containsKey(it.key) && deepEquals(it.value, b[it.key]) } + } + return a == b + } } /** @@ -46,34 +75,6 @@ class FlutterError( val details: Any? = null ) : Throwable() -private fun deepEqualsMessages(a: Any?, b: Any?): Boolean { - if (a is ByteArray && b is ByteArray) { - return a.contentEquals(b) - } - if (a is IntArray && b is IntArray) { - return a.contentEquals(b) - } - if (a is LongArray && b is LongArray) { - return a.contentEquals(b) - } - if (a is DoubleArray && b is DoubleArray) { - return a.contentEquals(b) - } - if (a is Array<*> && b is Array<*>) { - return a.size == b.size && a.indices.all { deepEqualsMessages(a[it], b[it]) } - } - if (a is List<*> && b is List<*>) { - return a.size == b.size && a.indices.all { deepEqualsMessages(a[it], b[it]) } - } - if (a is Map<*, *> && b is Map<*, *>) { - return a.size == b.size && - a.all { - (b as Map).containsKey(it.key) && deepEqualsMessages(it.value, b[it.key]) - } - } - return a == b -} - enum class Code(val raw: Int) { ONE(0), TWO(1); @@ -118,7 +119,7 @@ data class MessageData( if (this === other) { return true } - return deepEqualsMessages(toList(), other.toList()) + return MessagesPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -184,7 +185,7 @@ interface ExampleHostApi { try { listOf(api.getHostLanguage()) } catch (exception: Throwable) { - wrapError(exception) + MessagesPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -207,7 +208,7 @@ interface ExampleHostApi { try { listOf(api.add(aArg, bArg)) } catch (exception: Throwable) { - wrapError(exception) + MessagesPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -228,10 +229,10 @@ interface ExampleHostApi { api.sendMessage(messageArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(MessagesPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(MessagesPigeonUtils.wrapResult(data)) } } } @@ -274,7 +275,7 @@ class MessageFlutterApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(MessagesPigeonUtils.createConnectionError(channelName))) } } } diff --git a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart index c539afad5cfc..08d5bede903c 100644 --- a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart +++ b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart @@ -28,7 +28,7 @@ const DocumentCommentSpecification _docCommentSpec = blockContinuationToken: _docCommentContinuation, ); -String _codecName = 'PigeonCodec'; +const String _codecName = 'PigeonCodec'; /// Name of field used for host API codec. const String _pigeonMethodChannelCodec = 'PigeonMethodCodec'; @@ -317,7 +317,7 @@ class KotlinGenerator extends StructuredGenerator { indent.writeln('return true'); }); indent.write( - 'return deepEquals${generatorOptions.fileSpecificClassNameComponent}(toList(), other.toList())'); + 'return ${_getUtilsClassName(generatorOptions)}.deepEquals(toList(), other.toList())'); }); indent.newln(); @@ -655,6 +655,7 @@ if (wrapped == null) { dartPackageName: dartPackageName, onWriteBody: ( Indent indent, { + required InternalKotlinOptions generatorOptions, required List parameters, required TypeDeclaration returnType, required String channelName, @@ -665,6 +666,7 @@ if (wrapped == null) { ); _writeFlutterMethodMessageCall( indent, + generatorOptions: generatorOptions, parameters: parameters, returnType: returnType, channelName: '$channelName\$separatedMessageChannelSuffix', @@ -741,6 +743,7 @@ if (wrapped == null) { for (final Method method in api.methods) { _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: method.name, channelName: '${makeChannelName(api, method, dartPackageName)}\$separatedMessageChannelSuffix', @@ -823,6 +826,7 @@ if (wrapped == null) { const String setHandlerCondition = 'instanceManager != null'; _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: 'removeStrongReference', channelName: makeRemoveStrongReferenceChannelName(dartPackageName), @@ -847,6 +851,7 @@ if (wrapped == null) { ); _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: 'clear', channelName: makeClearChannelName(dartPackageName), taskQueueType: TaskQueueType.serial, @@ -1188,7 +1193,7 @@ if (wrapped == null) { void _writeWrapResult(Indent indent) { indent.newln(); - indent.write('private fun wrapResult(result: Any?): List '); + indent.write('fun wrapResult(result: Any?): List '); indent.addScoped('{', '}', () { indent.writeln('return listOf(result)'); }); @@ -1196,7 +1201,7 @@ if (wrapped == null) { void _writeWrapError(InternalKotlinOptions generatorOptions, Indent indent) { indent.newln(); - indent.write('private fun wrapError(exception: Throwable): List '); + indent.write('fun wrapError(exception: Throwable): List '); indent.addScoped('{', '}', () { indent.write( 'return if (exception is ${_getErrorClassName(generatorOptions)}) '); @@ -1242,7 +1247,7 @@ if (wrapped == null) { final String errorClassName = _getErrorClassName(generatorOptions); indent.newln(); indent.write( - 'private fun createConnectionError(channelName: String): $errorClassName '); + 'fun createConnectionError(channelName: String): $errorClassName '); indent.addScoped('{', '}', () { indent.write( 'return $errorClassName("channel-error", "Unable to establish connection on channel: \'\$channelName\'.", "")'); @@ -1251,7 +1256,7 @@ if (wrapped == null) { void _writeDeepEquals(InternalKotlinOptions generatorOptions, Indent indent) { indent.format(''' -private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any?, b: Any?): Boolean { +fun deepEquals(a: Any?, b: Any?): Boolean { if (a is ByteArray && b is ByteArray) { return a.contentEquals(b) } @@ -1266,16 +1271,16 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? } if (a is Array<*> && b is Array<*>) { return a.size == b.size && - a.indices.all{ deepEquals${generatorOptions.fileSpecificClassNameComponent}(a[it], b[it]) } + a.indices.all{ deepEquals(a[it], b[it]) } } if (a is List<*> && b is List<*>) { return a.size == b.size && - a.indices.all{ deepEquals${generatorOptions.fileSpecificClassNameComponent}(a[it], b[it]) } + a.indices.all{ deepEquals(a[it], b[it]) } } if (a is Map<*, *> && b is Map<*, *>) { return a.size == b.size && a.all { (b as Map).containsKey(it.key) && - deepEquals${generatorOptions.fileSpecificClassNameComponent}(it.value, b[it.key]) + deepEquals(it.value, b[it.key]) } } return a == b @@ -1290,19 +1295,26 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? Indent indent, { required String dartPackageName, }) { - if (root.containsHostApi || root.containsProxyApi) { - _writeWrapResult(indent); - _writeWrapError(generatorOptions, indent); - } - if (root.containsFlutterApi || root.containsProxyApi) { - _writeCreateConnectionError(generatorOptions, indent); - } + indent.writeScoped( + 'private object ${_getUtilsClassName(generatorOptions)} {', + '}', + () { + if (root.containsFlutterApi || root.containsProxyApi) { + _writeCreateConnectionError(generatorOptions, indent); + } + if (root.containsHostApi || root.containsProxyApi) { + _writeWrapResult(indent); + _writeWrapError(generatorOptions, indent); + } + if (root.classes.isNotEmpty) { + _writeDeepEquals(generatorOptions, indent); + } + }, + ); + if (generatorOptions.includeErrorClass) { _writeErrorClass(generatorOptions, indent); } - if (root.classes.isNotEmpty) { - _writeDeepEquals(generatorOptions, indent); - } } static void _writeMethodDeclaration( @@ -1367,6 +1379,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? void _writeHostMethodMessageHandler( Indent indent, { + required InternalKotlinOptions generatorOptions, required String name, required String channelName, required TaskQueueType taskQueueType, @@ -1419,14 +1432,17 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? indent.addScoped('{ result: Result<$resultType> ->', '}', () { indent.writeln('val error = result.exceptionOrNull()'); indent.writeScoped('if (error != null) {', '}', () { - indent.writeln('reply.reply(wrapError(error))'); + indent.writeln( + 'reply.reply(${_getUtilsClassName(generatorOptions)}.wrapError(error))'); }, addTrailingNewline: false); indent.addScoped(' else {', '}', () { if (returnType.isVoid) { - indent.writeln('reply.reply(wrapResult(null))'); + indent.writeln( + 'reply.reply(${_getUtilsClassName(generatorOptions)}.wrapResult(null))'); } else { indent.writeln('val data = result.getOrNull()'); - indent.writeln('reply.reply(wrapResult(data))'); + indent.writeln( + 'reply.reply(${_getUtilsClassName(generatorOptions)}.wrapResult(data))'); } }); }); @@ -1441,7 +1457,8 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? }, addTrailingNewline: false); indent.add(' catch (exception: Throwable) '); indent.addScoped('{', '}', () { - indent.writeln('wrapError(exception)'); + indent.writeln( + '${_getUtilsClassName(generatorOptions)}.wrapError(exception)'); }); indent.writeln('reply.reply(wrapped)'); } @@ -1465,6 +1482,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? int? minApiRequirement, void Function( Indent indent, { + required InternalKotlinOptions generatorOptions, required List parameters, required TypeDeclaration returnType, required String channelName, @@ -1486,6 +1504,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? indent.addScoped('{', '}', () { onWriteBody( indent, + generatorOptions: generatorOptions, parameters: parameters, returnType: returnType, channelName: channelName, @@ -1496,6 +1515,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? static void _writeFlutterMethodMessageCall( Indent indent, { + required InternalKotlinOptions generatorOptions, required List parameters, required TypeDeclaration returnType, required String channelName, @@ -1542,7 +1562,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? }, addTrailingNewline: false); indent.addScoped('else {', '} ', () { indent.writeln( - 'callback(Result.failure(createConnectionError(channelName)))'); + 'callback(Result.failure(${_getUtilsClassName(generatorOptions)}.createConnectionError(channelName)))'); }); }); } @@ -1839,7 +1859,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? ) if (api != null) { channel.setMessageHandler { _, reply -> - reply.reply(wrapError(UnsupportedOperationException( + reply.reply(${_getUtilsClassName(generatorOptions)}.wrapError(UnsupportedOperationException( "Call references class `$className`, which requires api version $apiRequirement." ))) } @@ -1872,6 +1892,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? onWrite: () { _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: name, channelName: channelName, taskQueueType: TaskQueueType.serial, @@ -1916,6 +1937,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? onWrite: () { _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: field.name, channelName: channelName, taskQueueType: TaskQueueType.serial, @@ -1961,6 +1983,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? onWrite: () { _writeHostMethodMessageHandler( indent, + generatorOptions: generatorOptions, name: method.name, channelName: makeChannelName(api, method, dartPackageName), taskQueueType: method.taskQueueType, @@ -2026,6 +2049,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? ], onWriteBody: ( Indent indent, { + required InternalKotlinOptions generatorOptions, required List parameters, required TypeDeclaration returnType, required String channelName, @@ -2069,6 +2093,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? indent.writeln('val codec = pigeonRegistrar.codec'); _writeFlutterMethodMessageCall( indent, + generatorOptions: generatorOptions, returnType: returnType, channelName: channelName, errorClassName: errorClassName, @@ -2136,6 +2161,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? ], onWriteBody: ( Indent indent, { + required InternalKotlinOptions generatorOptions, required List parameters, required TypeDeclaration returnType, required String channelName, @@ -2159,6 +2185,7 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? indent.writeln('val codec = pigeonRegistrar.codec'); _writeFlutterMethodMessageCall( indent, + generatorOptions: generatorOptions, returnType: returnType, channelName: channelName, errorClassName: errorClassName, @@ -2214,6 +2241,13 @@ private fun deepEquals${generatorOptions.fileSpecificClassNameComponent}(a: Any? String _getErrorClassName(InternalKotlinOptions generatorOptions) => generatorOptions.errorClassName ?? 'FlutterError'; +/// Calculates the name of the codec that will be generated for [api]. +String _getUtilsClassName(InternalKotlinOptions options) { + return toUpperCamelCase( + '${options.fileSpecificClassNameComponent}PigeonUtils', + ); +} + String _getArgumentName(int count, NamedType argument) => argument.name.isEmpty ? 'arg$count' : argument.name; diff --git a/packages/pigeon/lib/src/kotlin/templates.dart b/packages/pigeon/lib/src/kotlin/templates.dart index 0d87bcbdc7a7..652a0f683af5 100644 --- a/packages/pigeon/lib/src/kotlin/templates.dart +++ b/packages/pigeon/lib/src/kotlin/templates.dart @@ -48,7 +48,9 @@ class ${kotlinInstanceManagerClassName(options)}(private val finalizationListene private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) - private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } + private val releaseAllFinalizedInstancesRunnable = Runnable { + this.releaseAllFinalizedInstances() + } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false diff --git a/packages/pigeon/platform_tests/test_plugin/android/build.gradle b/packages/pigeon/platform_tests/test_plugin/android/build.gradle index 2789471f520d..69b532200de5 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/build.gradle +++ b/packages/pigeon/platform_tests/test_plugin/android/build.gradle @@ -65,7 +65,7 @@ android { } dependencies { - testImplementation 'junit:junit:4.+' + testImplementation 'junit:junit:4.13.2' testImplementation "io.mockk:mockk:1.13.16" // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions. // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7 diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt index a4da07d66a64..59187acc592f 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/CoreTests.gen.kt @@ -16,24 +16,53 @@ import io.flutter.plugin.common.StandardMessageCodec import java.io.ByteArrayOutputStream import java.nio.ByteBuffer -private fun wrapResult(result: Any?): List { - return listOf(result) -} +private object CoreTestsPigeonUtils { -private fun wrapError(exception: Throwable): List { - return if (exception is FlutterError) { - listOf(exception.code, exception.message, exception.details) - } else { - listOf( - exception.javaClass.simpleName, - exception.toString(), - "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + fun createConnectionError(channelName: String): FlutterError { + return FlutterError( + "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + } + + fun wrapResult(result: Any?): List { + return listOf(result) + } + + fun wrapError(exception: Throwable): List { + return if (exception is FlutterError) { + listOf(exception.code, exception.message, exception.details) + } else { + listOf( + exception.javaClass.simpleName, + exception.toString(), + "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + } } -} -private fun createConnectionError(channelName: String): FlutterError { - return FlutterError( - "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + fun deepEquals(a: Any?, b: Any?): Boolean { + if (a is ByteArray && b is ByteArray) { + return a.contentEquals(b) + } + if (a is IntArray && b is IntArray) { + return a.contentEquals(b) + } + if (a is LongArray && b is LongArray) { + return a.contentEquals(b) + } + if (a is DoubleArray && b is DoubleArray) { + return a.contentEquals(b) + } + if (a is Array<*> && b is Array<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is List<*> && b is List<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is Map<*, *> && b is Map<*, *>) { + return a.size == b.size && + a.all { (b as Map).containsKey(it.key) && deepEquals(it.value, b[it.key]) } + } + return a == b + } } /** @@ -49,34 +78,6 @@ class FlutterError( val details: Any? = null ) : Throwable() -private fun deepEqualsCoreTests(a: Any?, b: Any?): Boolean { - if (a is ByteArray && b is ByteArray) { - return a.contentEquals(b) - } - if (a is IntArray && b is IntArray) { - return a.contentEquals(b) - } - if (a is LongArray && b is LongArray) { - return a.contentEquals(b) - } - if (a is DoubleArray && b is DoubleArray) { - return a.contentEquals(b) - } - if (a is Array<*> && b is Array<*>) { - return a.size == b.size && a.indices.all { deepEqualsCoreTests(a[it], b[it]) } - } - if (a is List<*> && b is List<*>) { - return a.size == b.size && a.indices.all { deepEqualsCoreTests(a[it], b[it]) } - } - if (a is Map<*, *> && b is Map<*, *>) { - return a.size == b.size && - a.all { - (b as Map).containsKey(it.key) && deepEqualsCoreTests(it.value, b[it.key]) - } - } - return a == b -} - enum class AnEnum(val raw: Int) { ONE(0), TWO(1), @@ -123,7 +124,7 @@ data class UnusedClass(val aField: Any? = null) { if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -266,7 +267,7 @@ data class AllTypes( if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -421,7 +422,7 @@ data class AllNullableTypes( if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -565,7 +566,7 @@ data class AllNullableTypesWithoutRecursion( if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -628,7 +629,7 @@ data class AllClassesWrapper( if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -660,7 +661,7 @@ data class TestMessage(val testList: List? = null) { if (this === other) { return true } - return deepEqualsCoreTests(toList(), other.toList()) + return CoreTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -1236,7 +1237,7 @@ interface HostIntegrationCoreApi { api.noop() listOf(null) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1258,7 +1259,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoAllTypes(everythingArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1278,7 +1279,7 @@ interface HostIntegrationCoreApi { try { listOf(api.throwError()) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1299,7 +1300,7 @@ interface HostIntegrationCoreApi { api.throwErrorFromVoid() listOf(null) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1319,7 +1320,7 @@ interface HostIntegrationCoreApi { try { listOf(api.throwFlutterError()) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1341,7 +1342,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoInt(anIntArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1363,7 +1364,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoDouble(aDoubleArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1385,7 +1386,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoBool(aBoolArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1407,7 +1408,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoString(aStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1429,7 +1430,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoUint8List(aUint8ListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1451,7 +1452,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoObject(anObjectArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1473,7 +1474,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoList(listArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1495,7 +1496,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoEnumList(enumListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1517,7 +1518,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoClassList(classListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1539,7 +1540,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullEnumList(enumListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1561,7 +1562,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullClassList(classListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1583,7 +1584,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoMap(mapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1605,7 +1606,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoStringMap(stringMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1627,7 +1628,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoIntMap(intMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1649,7 +1650,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoEnumMap(enumMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1671,7 +1672,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoClassMap(classMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1693,7 +1694,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullStringMap(stringMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1715,7 +1716,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullIntMap(intMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1737,7 +1738,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullEnumMap(enumMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1759,7 +1760,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNonNullClassMap(classMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1781,7 +1782,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoClassWrapper(wrapperArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1803,7 +1804,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoEnum(anEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1825,7 +1826,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoAnotherEnum(anotherEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1847,7 +1848,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNamedDefaultString(aStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1869,7 +1870,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoOptionalDefaultDouble(aDoubleArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1891,7 +1892,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoRequiredInt(anIntArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1913,7 +1914,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoAllNullableTypes(everythingArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1935,7 +1936,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoAllNullableTypesWithoutRecursion(everythingArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1957,7 +1958,7 @@ interface HostIntegrationCoreApi { try { listOf(api.extractNestedNullableString(wrapperArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1979,7 +1980,7 @@ interface HostIntegrationCoreApi { try { listOf(api.createNestedNullableString(nullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2005,7 +2006,7 @@ interface HostIntegrationCoreApi { api.sendMultipleNullableTypes( aNullableBoolArg, aNullableIntArg, aNullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2031,7 +2032,7 @@ interface HostIntegrationCoreApi { api.sendMultipleNullableTypesWithoutRecursion( aNullableBoolArg, aNullableIntArg, aNullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2053,7 +2054,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableInt(aNullableIntArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2075,7 +2076,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableDouble(aNullableDoubleArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2097,7 +2098,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableBool(aNullableBoolArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2119,7 +2120,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableString(aNullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2141,7 +2142,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableUint8List(aNullableUint8ListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2163,7 +2164,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableObject(aNullableObjectArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2185,7 +2186,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableList(aNullableListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2207,7 +2208,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableEnumList(enumListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2229,7 +2230,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableClassList(classListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2251,7 +2252,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullEnumList(enumListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2273,7 +2274,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullClassList(classListArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2295,7 +2296,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableMap(mapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2317,7 +2318,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableStringMap(stringMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2339,7 +2340,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableIntMap(intMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2361,7 +2362,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableEnumMap(enumMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2383,7 +2384,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableClassMap(classMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2405,7 +2406,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullStringMap(stringMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2427,7 +2428,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullIntMap(intMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2449,7 +2450,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullEnumMap(enumMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2471,7 +2472,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableNonNullClassMap(classMapArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2493,7 +2494,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNullableEnum(anEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2515,7 +2516,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoAnotherNullableEnum(anotherEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2537,7 +2538,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoOptionalNullableInt(aNullableIntArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2559,7 +2560,7 @@ interface HostIntegrationCoreApi { try { listOf(api.echoNamedNullableString(aNullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2578,9 +2579,9 @@ interface HostIntegrationCoreApi { api.noopAsync { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(CoreTestsPigeonUtils.wrapResult(null)) } } } @@ -2601,10 +2602,10 @@ interface HostIntegrationCoreApi { api.echoAsyncInt(anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2625,10 +2626,10 @@ interface HostIntegrationCoreApi { api.echoAsyncDouble(aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2649,10 +2650,10 @@ interface HostIntegrationCoreApi { api.echoAsyncBool(aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2673,10 +2674,10 @@ interface HostIntegrationCoreApi { api.echoAsyncString(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2697,10 +2698,10 @@ interface HostIntegrationCoreApi { api.echoAsyncUint8List(aUint8ListArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2721,10 +2722,10 @@ interface HostIntegrationCoreApi { api.echoAsyncObject(anObjectArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2745,10 +2746,10 @@ interface HostIntegrationCoreApi { api.echoAsyncList(listArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2769,10 +2770,10 @@ interface HostIntegrationCoreApi { api.echoAsyncEnumList(enumListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2793,10 +2794,10 @@ interface HostIntegrationCoreApi { api.echoAsyncClassList(classListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2817,10 +2818,10 @@ interface HostIntegrationCoreApi { api.echoAsyncMap(mapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2841,10 +2842,10 @@ interface HostIntegrationCoreApi { api.echoAsyncStringMap(stringMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2865,10 +2866,10 @@ interface HostIntegrationCoreApi { api.echoAsyncIntMap(intMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2889,10 +2890,10 @@ interface HostIntegrationCoreApi { api.echoAsyncEnumMap(enumMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2913,10 +2914,10 @@ interface HostIntegrationCoreApi { api.echoAsyncClassMap(classMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2937,10 +2938,10 @@ interface HostIntegrationCoreApi { api.echoAsyncEnum(anEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2961,10 +2962,10 @@ interface HostIntegrationCoreApi { api.echoAnotherAsyncEnum(anotherEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -2983,10 +2984,10 @@ interface HostIntegrationCoreApi { api.throwAsyncError { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3005,9 +3006,9 @@ interface HostIntegrationCoreApi { api.throwAsyncErrorFromVoid { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(CoreTestsPigeonUtils.wrapResult(null)) } } } @@ -3026,10 +3027,10 @@ interface HostIntegrationCoreApi { api.throwAsyncFlutterError { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3050,10 +3051,10 @@ interface HostIntegrationCoreApi { api.echoAsyncAllTypes(everythingArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3075,10 +3076,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3100,10 +3101,10 @@ interface HostIntegrationCoreApi { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3124,10 +3125,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableInt(anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3148,10 +3149,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableDouble(aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3172,10 +3173,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableBool(aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3196,10 +3197,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableString(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3220,10 +3221,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableUint8List(aUint8ListArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3244,10 +3245,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableObject(anObjectArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3268,10 +3269,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableList(listArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3292,10 +3293,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableEnumList(enumListArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3317,10 +3318,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3341,10 +3342,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableMap(mapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3365,10 +3366,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableStringMap(stringMapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3389,10 +3390,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableIntMap(intMapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3413,10 +3414,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableEnumMap(enumMapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3438,10 +3439,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3462,10 +3463,10 @@ interface HostIntegrationCoreApi { api.echoAsyncNullableEnum(anEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3486,10 +3487,10 @@ interface HostIntegrationCoreApi { api.echoAnotherAsyncNullableEnum(anotherEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3509,7 +3510,7 @@ interface HostIntegrationCoreApi { try { listOf(api.defaultIsMainThread()) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -3530,7 +3531,7 @@ interface HostIntegrationCoreApi { try { listOf(api.taskQueueIsBackgroundThread()) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -3549,9 +3550,9 @@ interface HostIntegrationCoreApi { api.callFlutterNoop { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(CoreTestsPigeonUtils.wrapResult(null)) } } } @@ -3570,10 +3571,10 @@ interface HostIntegrationCoreApi { api.callFlutterThrowError { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3592,9 +3593,9 @@ interface HostIntegrationCoreApi { api.callFlutterThrowErrorFromVoid { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(CoreTestsPigeonUtils.wrapResult(null)) } } } @@ -3615,10 +3616,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoAllTypes(everythingArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3640,10 +3641,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3668,10 +3669,10 @@ interface HostIntegrationCoreApi { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3693,10 +3694,10 @@ interface HostIntegrationCoreApi { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3721,10 +3722,10 @@ interface HostIntegrationCoreApi { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3745,10 +3746,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoBool(aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3769,10 +3770,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoInt(anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3793,10 +3794,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoDouble(aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3817,10 +3818,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoString(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3841,10 +3842,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoUint8List(listArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3865,10 +3866,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoList(listArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3889,10 +3890,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoEnumList(enumListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3913,10 +3914,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoClassList(classListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3937,10 +3938,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNonNullEnumList(enumListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3962,10 +3963,10 @@ interface HostIntegrationCoreApi { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -3986,10 +3987,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoMap(mapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4010,10 +4011,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoStringMap(stringMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4034,10 +4035,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoIntMap(intMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4058,10 +4059,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoEnumMap(enumMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4083,10 +4084,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4108,10 +4109,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4132,10 +4133,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNonNullIntMap(intMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4156,10 +4157,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNonNullEnumMap(enumMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4181,10 +4182,10 @@ interface HostIntegrationCoreApi { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4205,10 +4206,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoEnum(anEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4229,10 +4230,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoAnotherEnum(anotherEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4253,10 +4254,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableBool(aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4277,10 +4278,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableInt(anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4301,10 +4302,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableDouble(aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4325,10 +4326,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableString(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4349,10 +4350,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableUint8List(listArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4373,10 +4374,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableList(listArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4397,10 +4398,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableEnumList(enumListArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4422,10 +4423,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4447,10 +4448,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4472,10 +4473,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4496,10 +4497,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableMap(mapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4521,10 +4522,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4545,10 +4546,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableIntMap(intMapArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4570,10 +4571,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4595,10 +4596,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4620,10 +4621,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4645,10 +4646,10 @@ interface HostIntegrationCoreApi { -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4670,10 +4671,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4695,10 +4696,10 @@ interface HostIntegrationCoreApi { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4719,10 +4720,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoNullableEnum(anEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4743,10 +4744,10 @@ interface HostIntegrationCoreApi { api.callFlutterEchoAnotherNullableEnum(anotherEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4767,10 +4768,10 @@ interface HostIntegrationCoreApi { api.callFlutterSmallApiEchoString(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -4810,7 +4811,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4830,7 +4831,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4849,7 +4850,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4876,7 +4877,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4899,7 +4900,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4935,7 +4936,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4958,7 +4959,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4994,7 +4995,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5021,7 +5022,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5048,7 +5049,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5075,7 +5076,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5102,7 +5103,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5129,7 +5130,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5156,7 +5157,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5183,7 +5184,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5213,7 +5214,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5240,7 +5241,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5270,7 +5271,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5297,7 +5298,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5327,7 +5328,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5354,7 +5355,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5384,7 +5385,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5414,7 +5415,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5444,7 +5445,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5471,7 +5472,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5501,7 +5502,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5531,7 +5532,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5558,7 +5559,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5585,7 +5586,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5605,7 +5606,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5625,7 +5626,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5645,7 +5646,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5665,7 +5666,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5685,7 +5686,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5705,7 +5706,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5728,7 +5729,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5751,7 +5752,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5774,7 +5775,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5797,7 +5798,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5817,7 +5818,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5840,7 +5841,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5863,7 +5864,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5886,7 +5887,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5909,7 +5910,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5932,7 +5933,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5955,7 +5956,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -5978,7 +5979,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6001,7 +6002,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6021,7 +6022,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6044,7 +6045,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6066,7 +6067,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6093,7 +6094,7 @@ class FlutterIntegrationCoreApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6131,7 +6132,7 @@ interface HostTrivialApi { api.noop() listOf(null) } catch (exception: Throwable) { - wrapError(exception) + CoreTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -6177,10 +6178,10 @@ interface HostSmallApi { api.echo(aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(CoreTestsPigeonUtils.wrapResult(data)) } } } @@ -6199,9 +6200,9 @@ interface HostSmallApi { api.voidVoid { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(CoreTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(CoreTestsPigeonUtils.wrapResult(null)) } } } @@ -6248,7 +6249,7 @@ class FlutterSmallApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -6275,7 +6276,7 @@ class FlutterSmallApi( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(CoreTestsPigeonUtils.createConnectionError(channelName))) } } } diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt index 63f971e424ab..dc0745c28967 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/EventChannelTests.gen.kt @@ -15,6 +15,34 @@ import io.flutter.plugin.common.StandardMethodCodec import java.io.ByteArrayOutputStream import java.nio.ByteBuffer +private object EventChannelTestsPigeonUtils { + fun deepEquals(a: Any?, b: Any?): Boolean { + if (a is ByteArray && b is ByteArray) { + return a.contentEquals(b) + } + if (a is IntArray && b is IntArray) { + return a.contentEquals(b) + } + if (a is LongArray && b is LongArray) { + return a.contentEquals(b) + } + if (a is DoubleArray && b is DoubleArray) { + return a.contentEquals(b) + } + if (a is Array<*> && b is Array<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is List<*> && b is List<*>) { + return a.size == b.size && a.indices.all { deepEquals(a[it], b[it]) } + } + if (a is Map<*, *> && b is Map<*, *>) { + return a.size == b.size && + a.all { (b as Map).containsKey(it.key) && deepEquals(it.value, b[it.key]) } + } + return a == b + } +} + /** * Error class for passing custom error details to Flutter via a thrown PlatformException. * @@ -28,35 +56,6 @@ class EventChannelTestsError( val details: Any? = null ) : Throwable() -private fun deepEqualsEventChannelTests(a: Any?, b: Any?): Boolean { - if (a is ByteArray && b is ByteArray) { - return a.contentEquals(b) - } - if (a is IntArray && b is IntArray) { - return a.contentEquals(b) - } - if (a is LongArray && b is LongArray) { - return a.contentEquals(b) - } - if (a is DoubleArray && b is DoubleArray) { - return a.contentEquals(b) - } - if (a is Array<*> && b is Array<*>) { - return a.size == b.size && a.indices.all { deepEqualsEventChannelTests(a[it], b[it]) } - } - if (a is List<*> && b is List<*>) { - return a.size == b.size && a.indices.all { deepEqualsEventChannelTests(a[it], b[it]) } - } - if (a is Map<*, *> && b is Map<*, *>) { - return a.size == b.size && - a.all { - (b as Map).containsKey(it.key) && - deepEqualsEventChannelTests(it.value, b[it.key]) - } - } - return a == b -} - enum class EventEnum(val raw: Int) { ONE(0), TWO(1), @@ -230,7 +229,7 @@ data class EventAllNullableTypes( if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -263,7 +262,7 @@ data class IntEvent(val value: Long) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -291,7 +290,7 @@ data class StringEvent(val value: String) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -319,7 +318,7 @@ data class BoolEvent(val value: Boolean) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -347,7 +346,7 @@ data class DoubleEvent(val value: Double) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -375,7 +374,7 @@ data class ObjectsEvent(val value: Any) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -403,7 +402,7 @@ data class EnumEvent(val value: EventEnum) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() @@ -431,7 +430,7 @@ data class ClassEvent(val value: EventAllNullableTypes) : PlatformEvent() { if (this === other) { return true } - return deepEqualsEventChannelTests(toList(), other.toList()) + return EventChannelTestsPigeonUtils.deepEquals(toList(), other.toList()) } override fun hashCode(): Int = toList().hashCode() diff --git a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt index 7b775b403636..3b1933827d60 100644 --- a/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt +++ b/packages/pigeon/platform_tests/test_plugin/android/src/main/kotlin/com/example/test_plugin/ProxyApiTests.gen.kt @@ -16,24 +16,27 @@ import io.flutter.plugin.common.StandardMessageCodec import java.io.ByteArrayOutputStream import java.nio.ByteBuffer -private fun wrapResult(result: Any?): List { - return listOf(result) -} +private object ProxyApiTestsPigeonUtils { -private fun wrapError(exception: Throwable): List { - return if (exception is ProxyApiTestsError) { - listOf(exception.code, exception.message, exception.details) - } else { - listOf( - exception.javaClass.simpleName, - exception.toString(), - "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + fun createConnectionError(channelName: String): ProxyApiTestsError { + return ProxyApiTestsError( + "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + } + + fun wrapResult(result: Any?): List { + return listOf(result) } -} -private fun createConnectionError(channelName: String): ProxyApiTestsError { - return ProxyApiTestsError( - "channel-error", "Unable to establish connection on channel: '$channelName'.", "") + fun wrapError(exception: Throwable): List { + return if (exception is ProxyApiTestsError) { + listOf(exception.code, exception.message, exception.details) + } else { + listOf( + exception.javaClass.simpleName, + exception.toString(), + "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)) + } + } } /** @@ -78,7 +81,9 @@ class ProxyApiTestsPigeonInstanceManager( private val referenceQueue = java.lang.ref.ReferenceQueue() private val weakReferencesToIdentifiers = HashMap, Long>() private val handler = android.os.Handler(android.os.Looper.getMainLooper()) - private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() } + private val releaseAllFinalizedInstancesRunnable = Runnable { + this.releaseAllFinalizedInstances() + } private var nextIdentifier: Long = minHostCreatedIdentifier private var hasFinalizationListenerStopped = false @@ -291,7 +296,7 @@ private class ProxyApiTestsPigeonInstanceManagerApi(val binaryMessenger: BinaryM instanceManager.remove(identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -312,7 +317,7 @@ private class ProxyApiTestsPigeonInstanceManagerApi(val binaryMessenger: BinaryM instanceManager.clear() listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -337,7 +342,7 @@ private class ProxyApiTestsPigeonInstanceManagerApi(val binaryMessenger: BinaryM callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -1089,7 +1094,7 @@ abstract class PigeonApiProxyApiTestClass( pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1150,7 +1155,7 @@ abstract class PigeonApiProxyApiTestClass( pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1175,7 +1180,7 @@ abstract class PigeonApiProxyApiTestClass( api.attachedField(pigeon_instanceArg), pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1199,7 +1204,7 @@ abstract class PigeonApiProxyApiTestClass( api.staticAttachedField(), pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1222,7 +1227,7 @@ abstract class PigeonApiProxyApiTestClass( api.noop(pigeon_instanceArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1244,7 +1249,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.throwError(pigeon_instanceArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1267,7 +1272,7 @@ abstract class PigeonApiProxyApiTestClass( api.throwErrorFromVoid(pigeon_instanceArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1289,7 +1294,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.throwFlutterError(pigeon_instanceArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1312,7 +1317,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoInt(pigeon_instanceArg, anIntArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1335,7 +1340,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoDouble(pigeon_instanceArg, aDoubleArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1358,7 +1363,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoBool(pigeon_instanceArg, aBoolArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1381,7 +1386,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoString(pigeon_instanceArg, aStringArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1404,7 +1409,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoUint8List(pigeon_instanceArg, aUint8ListArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1427,7 +1432,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoObject(pigeon_instanceArg, anObjectArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1450,7 +1455,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoList(pigeon_instanceArg, aListArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1473,7 +1478,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoProxyApiList(pigeon_instanceArg, aListArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1496,7 +1501,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoMap(pigeon_instanceArg, aMapArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1519,7 +1524,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoProxyApiMap(pigeon_instanceArg, aMapArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1542,7 +1547,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoEnum(pigeon_instanceArg, anEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1565,7 +1570,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoProxyApi(pigeon_instanceArg, aProxyApiArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1588,7 +1593,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableInt(pigeon_instanceArg, aNullableIntArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1611,7 +1616,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableDouble(pigeon_instanceArg, aNullableDoubleArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1634,7 +1639,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableBool(pigeon_instanceArg, aNullableBoolArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1657,7 +1662,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableString(pigeon_instanceArg, aNullableStringArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1680,7 +1685,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableUint8List(pigeon_instanceArg, aNullableUint8ListArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1703,7 +1708,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableObject(pigeon_instanceArg, aNullableObjectArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1726,7 +1731,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableList(pigeon_instanceArg, aNullableListArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1749,7 +1754,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableMap(pigeon_instanceArg, aNullableMapArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1772,7 +1777,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableEnum(pigeon_instanceArg, aNullableEnumArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1795,7 +1800,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoNullableProxyApi(pigeon_instanceArg, aNullableProxyApiArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -1816,9 +1821,9 @@ abstract class PigeonApiProxyApiTestClass( api.noopAsync(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -1840,10 +1845,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncInt(pigeon_instanceArg, anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1865,10 +1870,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncDouble(pigeon_instanceArg, aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1890,10 +1895,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncBool(pigeon_instanceArg, aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1915,10 +1920,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncString(pigeon_instanceArg, aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1940,10 +1945,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncUint8List(pigeon_instanceArg, aUint8ListArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1965,10 +1970,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncObject(pigeon_instanceArg, anObjectArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -1990,10 +1995,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncList(pigeon_instanceArg, aListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2015,10 +2020,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncMap(pigeon_instanceArg, aMapArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2040,10 +2045,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncEnum(pigeon_instanceArg, anEnumArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2064,10 +2069,10 @@ abstract class PigeonApiProxyApiTestClass( api.throwAsyncError(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2088,9 +2093,9 @@ abstract class PigeonApiProxyApiTestClass( api.throwAsyncErrorFromVoid(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -2111,10 +2116,10 @@ abstract class PigeonApiProxyApiTestClass( api.throwAsyncFlutterError(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2136,10 +2141,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableInt(pigeon_instanceArg, anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2161,10 +2166,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableDouble(pigeon_instanceArg, aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2186,10 +2191,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableBool(pigeon_instanceArg, aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2211,10 +2216,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableString(pigeon_instanceArg, aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2237,10 +2242,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2262,10 +2267,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableObject(pigeon_instanceArg, anObjectArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2287,10 +2292,10 @@ abstract class PigeonApiProxyApiTestClass( api.echoAsyncNullableList(pigeon_instanceArg, aListArg) { result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2313,10 +2318,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2339,10 +2344,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2363,7 +2368,7 @@ abstract class PigeonApiProxyApiTestClass( api.staticNoop() listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2385,7 +2390,7 @@ abstract class PigeonApiProxyApiTestClass( try { listOf(api.echoStaticString(aStringArg)) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -2404,9 +2409,9 @@ abstract class PigeonApiProxyApiTestClass( api.staticAsyncNoop { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -2427,9 +2432,9 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterNoop(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -2450,10 +2455,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterThrowError(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2474,9 +2479,9 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterThrowErrorFromVoid(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -2498,10 +2503,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoBool(pigeon_instanceArg, aBoolArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2523,10 +2528,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoInt(pigeon_instanceArg, anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2548,10 +2553,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoDouble(pigeon_instanceArg, aDoubleArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2573,10 +2578,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoString(pigeon_instanceArg, aStringArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2599,10 +2604,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2624,10 +2629,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoList(pigeon_instanceArg, aListArg) { result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2650,10 +2655,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2676,10 +2681,10 @@ abstract class PigeonApiProxyApiTestClass( -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2702,10 +2707,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2728,10 +2733,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2754,10 +2759,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2780,10 +2785,10 @@ abstract class PigeonApiProxyApiTestClass( -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2805,10 +2810,10 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterEchoNullableInt(pigeon_instanceArg, anIntArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2831,10 +2836,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2857,10 +2862,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2883,10 +2888,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2909,10 +2914,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2935,10 +2940,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result?> -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2961,10 +2966,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -2987,10 +2992,10 @@ abstract class PigeonApiProxyApiTestClass( result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -3011,9 +3016,9 @@ abstract class PigeonApiProxyApiTestClass( api.callFlutterNoopAsync(pigeon_instanceArg) { result: Result -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { - reply.reply(wrapResult(null)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(null)) } } } @@ -3036,10 +3041,10 @@ abstract class PigeonApiProxyApiTestClass( -> val error = result.exceptionOrNull() if (error != null) { - reply.reply(wrapError(error)) + reply.reply(ProxyApiTestsPigeonUtils.wrapError(error)) } else { val data = result.getOrNull() - reply.reply(wrapResult(data)) + reply.reply(ProxyApiTestsPigeonUtils.wrapResult(data)) } } } @@ -3091,7 +3096,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3120,7 +3125,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3151,7 +3156,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3191,7 +3196,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3230,7 +3235,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3270,7 +3275,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3310,7 +3315,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3350,7 +3355,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3390,7 +3395,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3430,7 +3435,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3469,7 +3474,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3509,7 +3514,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3549,7 +3554,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3589,7 +3594,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3622,7 +3627,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3655,7 +3660,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3688,7 +3693,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3721,7 +3726,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3754,7 +3759,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3787,7 +3792,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3820,7 +3825,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3853,7 +3858,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3886,7 +3891,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3917,7 +3922,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -3957,7 +3962,7 @@ abstract class PigeonApiProxyApiTestClass( callback(Result.success(output)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4003,7 +4008,7 @@ abstract class PigeonApiProxyApiSuperClass( api.pigeon_defaultConstructor(), pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -4026,7 +4031,7 @@ abstract class PigeonApiProxyApiSuperClass( api.aSuperMethod(pigeon_instanceArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -4067,7 +4072,7 @@ abstract class PigeonApiProxyApiSuperClass( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4105,7 +4110,7 @@ open class PigeonApiProxyApiInterface( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4133,7 +4138,7 @@ open class PigeonApiProxyApiInterface( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } @@ -4173,7 +4178,7 @@ abstract class PigeonApiClassWithApiRequirement( api.pigeon_defaultConstructor(), pigeon_identifierArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -4190,7 +4195,7 @@ abstract class PigeonApiClassWithApiRequirement( if (api != null) { channel.setMessageHandler { _, reply -> reply.reply( - wrapError( + ProxyApiTestsPigeonUtils.wrapError( UnsupportedOperationException( "Call references class `ClassWithApiRequirement`, which requires api version 25."))) } @@ -4214,7 +4219,7 @@ abstract class PigeonApiClassWithApiRequirement( api.aMethod(pigeon_instanceArg) listOf(null) } catch (exception: Throwable) { - wrapError(exception) + ProxyApiTestsPigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -4231,7 +4236,7 @@ abstract class PigeonApiClassWithApiRequirement( if (api != null) { channel.setMessageHandler { _, reply -> reply.reply( - wrapError( + ProxyApiTestsPigeonUtils.wrapError( UnsupportedOperationException( "Call references class `ClassWithApiRequirement`, which requires api version 25."))) } @@ -4273,7 +4278,7 @@ abstract class PigeonApiClassWithApiRequirement( callback(Result.success(Unit)) } } else { - callback(Result.failure(createConnectionError(channelName))) + callback(Result.failure(ProxyApiTestsPigeonUtils.createConnectionError(channelName))) } } } diff --git a/packages/pigeon/test/kotlin/proxy_api_test.dart b/packages/pigeon/test/kotlin/proxy_api_test.dart index ebba673d3b9b..561acd364a0b 100644 --- a/packages/pigeon/test/kotlin/proxy_api_test.dart +++ b/packages/pigeon/test/kotlin/proxy_api_test.dart @@ -1025,6 +1025,7 @@ void main() { dartPackageName: DEFAULT_PACKAGE_NAME, ); final String code = sink.toString(); + final String collapsedCode = _collapseNewlineAndIndentation(code); expect( code, @@ -1040,9 +1041,9 @@ void main() { ); expect( - code, + collapsedCode, contains( - 'private val releaseAllFinalizedInstancesRunnable = { this.releaseAllFinalizedInstances() }', + 'private val releaseAllFinalizedInstancesRunnable = Runnable { this.releaseAllFinalizedInstances() }', ), ); expect( From dd206a062b2bef00830c5edd4a44ede9421a4557 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:16:01 -0400 Subject: [PATCH 16/20] changelog --- packages/pigeon/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 8c69aa182acc..97e4971a17cf 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,6 +1,7 @@ ## 25.3.1 * [kotlin] Fixes Kotlin InstanceManager not properly removing callbacks from handler. +* [kotlin] Fixes `SyntheticAccessor` lint caused by private utility methods. ## 25.3.0 From 78d8248f09a6a242978405887fa42c28a405c5a9 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:19:38 -0400 Subject: [PATCH 17/20] fix tests --- packages/pigeon/lib/src/kotlin/kotlin_generator.dart | 2 +- packages/pigeon/test/kotlin_generator_test.dart | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart index 08d5bede903c..d013516ce64f 100644 --- a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart +++ b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart @@ -2244,7 +2244,7 @@ String _getErrorClassName(InternalKotlinOptions generatorOptions) => /// Calculates the name of the codec that will be generated for [api]. String _getUtilsClassName(InternalKotlinOptions options) { return toUpperCamelCase( - '${options.fileSpecificClassNameComponent}PigeonUtils', + '${options.fileSpecificClassNameComponent ?? ''}PigeonUtils', ); } diff --git a/packages/pigeon/test/kotlin_generator_test.dart b/packages/pigeon/test/kotlin_generator_test.dart index a22d0bec4842..2a72e6088047 100644 --- a/packages/pigeon/test/kotlin_generator_test.dart +++ b/packages/pigeon/test/kotlin_generator_test.dart @@ -249,7 +249,7 @@ void main() { val wrapped: List = try { listOf(api.doSomething(inputArg)) } catch (exception: Throwable) { - wrapError(exception) + PigeonUtils.wrapError(exception) } reply.reply(wrapped) } @@ -804,7 +804,7 @@ void main() { final String code = sink.toString(); expect(code, contains('interface Api')); expect(code, contains('api.doSomething(argArg) {')); - expect(code, contains('reply.reply(wrapResult(data))')); + expect(code, contains('reply.reply(PigeonUtils.wrapResult(data))')); }); test('gen one async Flutter Api', () { @@ -1631,7 +1631,7 @@ void main() { expect( code, contains( - 'callback(Result.failure(createConnectionError(channelName)))')); + 'callback(Result.failure(PigeonUtils.createConnectionError(channelName)))')); }); test('gen host uses default error class', () { From f9145d245aa8a8972db82fd8632348aa27f5565d Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:24:56 -0400 Subject: [PATCH 18/20] fix docs --- packages/pigeon/lib/src/kotlin/kotlin_generator.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart index d013516ce64f..bd2719d92d47 100644 --- a/packages/pigeon/lib/src/kotlin/kotlin_generator.dart +++ b/packages/pigeon/lib/src/kotlin/kotlin_generator.dart @@ -2241,7 +2241,8 @@ fun deepEquals(a: Any?, b: Any?): Boolean { String _getErrorClassName(InternalKotlinOptions generatorOptions) => generatorOptions.errorClassName ?? 'FlutterError'; -/// Calculates the name of the codec that will be generated for [api]. +/// Calculates the name of the private utils class that will be generated for +/// the file. String _getUtilsClassName(InternalKotlinOptions options) { return toUpperCamelCase( '${options.fileSpecificClassNameComponent ?? ''}PigeonUtils', From 17ae12d581e5741e68bf56d3cf8bfb11531485fe Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Tue, 15 Apr 2025 20:30:47 -0400 Subject: [PATCH 19/20] add kotlin lint to linux tests --- packages/pigeon/tool/run_tests.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pigeon/tool/run_tests.dart b/packages/pigeon/tool/run_tests.dart index 28229972834f..7c6c12c428a5 100644 --- a/packages/pigeon/tool/run_tests.dart +++ b/packages/pigeon/tool/run_tests.dart @@ -184,6 +184,7 @@ Future main(List args) async { androidJavaUnitTests, androidJavaLint, androidKotlinUnitTests, + androidKotlinLint, androidJavaIntegrationTests, androidKotlinIntegrationTests, linuxUnitTests, From 69ea982a329dffc194050071fe5360bf4a613f6c Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:38:52 -0400 Subject: [PATCH 20/20] add lint to local tests --- packages/pigeon/tool/test.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pigeon/tool/test.dart b/packages/pigeon/tool/test.dart index 07c7dfdf61b0..dd1b331c43d2 100644 --- a/packages/pigeon/tool/test.dart +++ b/packages/pigeon/tool/test.dart @@ -78,6 +78,7 @@ ${parser.usage}'''); androidJavaIntegrationTests, androidKotlinIntegrationTests, androidJavaLint, + androidKotlinLint, ]; const List iOSTests = [ iOSObjCUnitTests,