Skip to content

Commit 0939198

Browse files
authored
[pigeon] Update for compatibility with a future change to the analyzer. (flutter#3789)
We would like to make a change to the Dart analyzer, but the code in pigeon is written in a way that is not compatible with the future change. https://dart-review.googlesource.com/c/sdk/+/294920 ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [relevant style guides] and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use `dart format`.) - [ ] I signed the [CLA]. - [ ] The title of the PR starts with the name of the package surrounded by square brackets, e.g. `[shared_preferences]` - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes]. - [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style]. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [relevant style guides]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat [pub versioning philosophy]: https://dart.dev/tools/pub/versioning [exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates [following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
1 parent 9989606 commit 0939198

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

packages/pigeon/lib/pigeon_lib.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,15 +1071,14 @@ class _RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
10711071
if (_currentApi != null) {
10721072
// Methods without named return types aren't supported.
10731073
final dart_ast.TypeAnnotation returnType = node.returnType!;
1074-
final dart_ast.SimpleIdentifier returnTypeIdentifier =
1075-
getFirstChildOfType<dart_ast.SimpleIdentifier>(returnType)!;
1074+
returnType as dart_ast.NamedType;
10761075
_currentApi!.methods.add(
10771076
Method(
10781077
name: node.name.lexeme,
10791078
returnType: TypeDeclaration(
1080-
baseName: returnTypeIdentifier.name,
1081-
typeArguments: typeAnnotationsToTypeArguments(
1082-
(returnType as dart_ast.NamedType).typeArguments),
1079+
baseName: returnType.name.name,
1080+
typeArguments:
1081+
typeAnnotationsToTypeArguments(returnType.typeArguments),
10831082
isNullable: returnType.question != null),
10841083
arguments: arguments,
10851084
isAsynchronous: isAsynchronous,

0 commit comments

Comments
 (0)