Skip to content

[pigeon] Add errors for ProxyAPI callback methods and null instances when reading in a ProxyApiBaseCodec #8567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 18 commits into from
Feb 10, 2025
Merged

[pigeon] Add errors for ProxyAPI callback methods and null instances when reading in a ProxyApiBaseCodec #8567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dfc15f2
improve error messaging
bparrishMines Feb 4, 2025
ed6e1f6
add null check
bparrishMines Feb 4, 2025
45cf10b
fixes
bparrishMines Feb 4, 2025
6dbf647
undo change
bparrishMines Feb 4, 2025
a5fb30e
with not will
bparrishMines Feb 4, 2025
3d3e63c
remove non overrides
bparrishMines Feb 4, 2025
7fbc58f
remove unused implementations
bparrishMines Feb 4, 2025
79b802f
Merge branch 'main' of github.com:flutter/packages into pigeon_requir…
bparrishMines Feb 5, 2025
4229dba
add fix for not calling completion
bparrishMines Feb 5, 2025
4c06e7c
fix kotlin
bparrishMines Feb 6, 2025
56c2dd4
Merge branch 'main' of github.com:flutter/packages into pigeon_requir…
bparrishMines Feb 6, 2025
2e40742
improve method structure
bparrishMines Feb 6, 2025
a3c219e
undo non proxy api change
bparrishMines Feb 6, 2025
2c3c947
changed my mind and updated other voids
bparrishMines Feb 6, 2025
4803803
unneccssary return call
bparrishMines Feb 10, 2025
b32a5da
Merge branch 'main' of github.com:flutter/packages into pigeon_requir…
bparrishMines Feb 10, 2025
61aab9f
fix swift test
bparrishMines Feb 10, 2025
b4553a2
change location of space
bparrishMines Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
change location of space
  • Loading branch information
@bparrishMines
bparrishMines committed Feb 10, 2025
commit b4553a280a7ccc1e4d724d034c3dccbd7dbe4d92
8 changes: 4 additions & 4 deletions packages/pigeon/lib/src/kotlin/kotlin_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1914,7 +1914,7 @@ if (wrapped == null) {
}) {
indent.writeScoped(
'if (pigeonRegistrar.ignoreCallsToDart) {',
'} ',
'}',
() {
indent.format(
'''
Expand All @@ -1926,14 +1926,14 @@ if (wrapped == null) {
addTrailingNewline: false,
);
indent.writeScoped(
'else if (pigeonRegistrar.instanceManager.containsInstance(${classMemberNamePrefix}instanceArg)) {',
'} ',
' else if (pigeonRegistrar.instanceManager.containsInstance(${classMemberNamePrefix}instanceArg)) {',
'}',
() {
indent.writeln('callback(Result.success(Unit))');
},
addTrailingNewline: false,
);
indent.writeScoped('else {', '}', () {
indent.writeScoped(' else {', '}', () {
if (api.hasCallbackConstructor()) {
indent.writeln(
'val ${classMemberNamePrefix}identifierArg = pigeonRegistrar.instanceManager.addHostCreatedInstance(${classMemberNamePrefix}instanceArg)',
Expand Down
8 changes: 4 additions & 4 deletions packages/pigeon/lib/src/swift/swift_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2313,7 +2313,7 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
indent.writeScoped('$methodSignature {', '}', () {
indent.writeScoped(
'if pigeonRegistrar.ignoreCallsToDart {',
'} ',
'}',
() {
indent.format(
'''
Expand All @@ -2328,14 +2328,14 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
);

indent.writeScoped(
'else if pigeonRegistrar.instanceManager.containsInstance(pigeonInstance as AnyObject) {',
'} ',
' else if pigeonRegistrar.instanceManager.containsInstance(pigeonInstance as AnyObject) {',
'}',
() {
indent.writeln('completion(.success(()))');
},
addTrailingNewline: false,
);
indent.writeScoped('else {', '}', () {
indent.writeScoped(' else {', '}', () {
if (api.hasCallbackConstructor()) {
indent.writeln(
'let pigeonIdentifierArg = pigeonRegistrar.instanceManager.addHostCreatedInstance(pigeonInstance as AnyObject)',
Expand Down