Skip to content

[pigeon] Updates PigeonInstanceMangerApi to use the shared api channel code in Dart #6831

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 9 commits into from
May 30, 2024
Merged

[pigeon] Updates PigeonInstanceMangerApi to use the shared api channel code in Dart #6831

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42a2bee
used shared channel code for api
bparrishMines May 29, 2024
35a4482
version bump
bparrishMines May 29, 2024
caed05e
fix extra code
bparrishMines May 29, 2024
8a281ff
test
bparrishMines May 29, 2024
1d13ee7
Merge branch 'main' of github.com:flutter/packages into pigeon_dart_i…
bparrishMines May 29, 2024
99f2aec
fix addSuffixVariable
bparrishMines May 29, 2024
c255e52
fix tests
bparrishMines May 29, 2024
54e6a6d
fix variable name
bparrishMines May 30, 2024
be50919
Merge branch 'main' of github.com:flutter/packages into pigeon_dart_i…
bparrishMines May 30, 2024
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
Next Next commit
fix extra code
  • Loading branch information
@bparrishMines
bparrishMines committed May 29, 2024
commit caed05eb5c93717d15b641ad9f667e85c30f2d0c
107 changes: 0 additions & 107 deletions packages/pigeon/lib/dart/templates.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,113 +215,6 @@ class $instanceManagerClassName {
''';
}

// /// Creates the `InstanceManagerApi` with the passed string values.
// String instanceManagerApiTemplate({
// required String dartPackageName,
// required String pigeonChannelCodecVarName,
// }) {
// const String apiName = '${instanceManagerClassName}Api';
//
// final String removeStrongReferenceName = makeChannelNameWithStrings(
// apiName: apiName,
// methodName: 'removeStrongReference',
// dartPackageName: dartPackageName,
// );
//
// final String clearName = makeChannelNameWithStrings(
// apiName: apiName,
// methodName: 'clear',
// dartPackageName: dartPackageName,
// );
//
// return '''
// /// Generated API for managing the Dart and native `$instanceManagerClassName`s.
// class _$apiName {
// /// Constructor for [_$apiName].
// _$apiName({BinaryMessenger? binaryMessenger})
// : _binaryMessenger = binaryMessenger;
//
// final BinaryMessenger? _binaryMessenger;
//
// static const MessageCodec<Object?> $pigeonChannelCodecVarName =
// StandardMessageCodec();
//
// static void setUpMessageHandlers({
// BinaryMessenger? binaryMessenger,
// $instanceManagerClassName? instanceManager,
// }) {
// const String channelName =
// r'$removeStrongReferenceName';
// final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
// channelName,
// $pigeonChannelCodecVarName,
// binaryMessenger: binaryMessenger,
// );
// channel.setMessageHandler((Object? message) async {
// assert(
// message != null,
// 'Argument for \$channelName was null.',
// );
// final int? identifier = message as int?;
// assert(
// identifier != null,
// r'Argument for \$channelName, expected non-null int.',
// );
// (instanceManager ?? $instanceManagerClassName.instance).remove(identifier!);
// return;
// });
// }
//
// Future<void> removeStrongReference(int identifier) async {
// const String channelName =
// r'$removeStrongReferenceName';
// final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
// channelName,
// $pigeonChannelCodecVarName,
// binaryMessenger: _binaryMessenger,
// );
// final List<Object?>? replyList =
// await channel.send(identifier) as List<Object?>?;
// if (replyList == null) {
// throw _createConnectionError(channelName);
// } else if (replyList.length > 1) {
// throw PlatformException(
// code: replyList[0]! as String,
// message: replyList[1] as String?,
// details: replyList[2],
// );
// } else {
// return;
// }
// }
//
// /// Clear the native `$instanceManagerClassName`.
// ///
// /// This is typically called after a hot restart.
// Future<void> clear() async {
// const String channelName =
// r'$clearName';
// final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
// channelName,
// $pigeonChannelCodecVarName,
// binaryMessenger: _binaryMessenger,
// );
// final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
// if (replyList == null) {
// throw _createConnectionError(channelName);
// } else if (replyList.length > 1) {
// throw PlatformException(
// code: replyList[0]! as String,
// message: replyList[1] as String?,
// details: replyList[2],
// );
// } else {
// return;
// }
// }
// }''';
// }

/// The base class for all ProxyApis.
///
/// All Dart classes generated as a ProxyApi extends this one.
Expand Down
18 changes: 8 additions & 10 deletions packages/pigeon/lib/dart_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ final BinaryMessenger? ${_varNamePrefix}binaryMessenger;
Indent indent, {
required String dartPackageName,
}) {
const String apiName = '${instanceManagerClassName}Api';

final cb.Parameter binaryMessengerParameter = cb.Parameter(
(cb.ParameterBuilder builder) => builder
..name = 'binaryMessenger'
Expand All @@ -482,15 +484,6 @@ final BinaryMessenger? ${_varNamePrefix}binaryMessenger;
..modifier = cb.FieldModifier.final$,
);

final cb.Parameter instanceManagerParameter = cb.Parameter(
(cb.ParameterBuilder builder) => builder
..name = 'instanceManager'
..named = true
..type = cb.refer('$instanceManagerClassName?'),
);

const String apiName = '${instanceManagerClassName}Api';

final String removeStrongReferenceName = makeChannelNameWithStrings(
apiName: apiName,
methodName: 'removeStrongReference',
Expand Down Expand Up @@ -548,7 +541,12 @@ final BinaryMessenger? ${_varNamePrefix}binaryMessenger;
..defaultTo = const cb.Code('false'),
),
binaryMessengerParameter,
instanceManagerParameter,
cb.Parameter(
(cb.ParameterBuilder builder) => builder
..name = 'instanceManager'
..named = true
..type = cb.refer('$instanceManagerClassName?'),
),
])
..body = cb.Block.of(
cb.Block(
Expand Down