Skip to content

Commit df17293

Browse files
authored
[pigeon] add support for analyzer 13 and 14 (flutter#12358)
updates ast crawling to use new argument classes. supports major analyzer versions 13 and 14. fixes flutter#187145
1 parent 17c97d0 commit df17293

4 files changed

Lines changed: 46 additions & 48 deletions

File tree

‎packages/pigeon/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 27.3.1
2+
3+
* Updates `analyzer` dependency to support versions 13 and 14.
4+
* Updates minimum Dart SDK constraint to 3.11.0.
5+
6+
17
## 27.3.0
28

39
* Adds support for sharing constants across platforms.

‎packages/pigeon/lib/src/generator_tools.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'generator.dart';
1515
/// The current version of pigeon.
1616
///
1717
/// This must match the version in pubspec.yaml.
18-
const String pigeonVersion = '27.3.0';
18+
const String pigeonVersion = '27.3.1';
1919

2020
/// Default plugin package name.
2121
const String defaultPluginPackageName = 'dev.flutter.pigeon';

‎packages/pigeon/lib/src/pigeon_lib_internal.dart‎

Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,13 +1312,13 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
13121312
Object _expressionToMap(dart_ast.Expression expression) {
13131313
if (expression is dart_ast.MethodInvocation) {
13141314
final result = <String, Object>{};
1315-
for (final dart_ast.Expression argument in expression.argumentList.arguments) {
1316-
if (argument is dart_ast.NamedExpression) {
1317-
result[argument.name.label.name] = _expressionToMap(argument.expression);
1315+
for (final dart_ast.Argument argument in expression.argumentList.arguments) {
1316+
if (argument is dart_ast.NamedArgument) {
1317+
result[argument.name.lexeme] = _expressionToMap(argument.argumentExpression);
13181318
} else {
13191319
_errors.add(
13201320
Error(
1321-
message: 'expected NamedExpression but found $expression',
1321+
message: 'expected NamedArgument but found $argument',
13221322
lineNumber: calculateLineNumber(source, argument.offset),
13231323
),
13241324
);
@@ -1518,17 +1518,19 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
15181518
@override
15191519
Object? visitAnnotation(dart_ast.Annotation node) {
15201520
if (node.name.name == 'ConfigurePigeon') {
1521-
if (node.arguments == null) {
1521+
final dart_ast.ArgumentList? arguments = node.arguments;
1522+
if (arguments == null) {
15221523
_errors.add(
15231524
Error(
15241525
message: 'ConfigurePigeon expects a PigeonOptions() call.',
15251526
lineNumber: calculateLineNumber(source, node.offset),
15261527
),
15271528
);
1529+
} else {
1530+
final pigeonOptionsMap =
1531+
_expressionToMap(arguments.arguments.first.argumentExpression) as Map<String, Object>;
1532+
_pigeonOptions = pigeonOptionsMap;
15281533
}
1529-
final pigeonOptionsMap =
1530-
_expressionToMap(node.arguments!.arguments.first) as Map<String, Object>;
1531-
_pigeonOptions = pigeonOptionsMap;
15321534
}
15331535
node.visitChildren(this);
15341536
return null;
@@ -1555,11 +1557,13 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
15551557
(dart_ast.Annotation element) => element.name.name == 'HostApi',
15561558
);
15571559
String? dartHostTestHandler;
1558-
if (hostApi.arguments != null) {
1559-
for (final dart_ast.Expression expression in hostApi.arguments!.arguments) {
1560-
if (expression is dart_ast.NamedExpression) {
1561-
if (expression.name.label.name == 'dartHostTestHandler') {
1562-
final dart_ast.Expression dartHostTestHandlerExpression = expression.expression;
1560+
final dart_ast.ArgumentList? arguments = hostApi.arguments;
1561+
if (arguments != null) {
1562+
for (final dart_ast.Argument argument in arguments.arguments) {
1563+
if (argument is dart_ast.NamedArgument) {
1564+
if (argument.name.lexeme == 'dartHostTestHandler') {
1565+
final dart_ast.Expression dartHostTestHandlerExpression =
1566+
argument.argumentExpression;
15631567
if (dartHostTestHandlerExpression is dart_ast.SimpleStringLiteral) {
15641568
dartHostTestHandler = dartHostTestHandlerExpression.value;
15651569
}
@@ -1586,9 +1590,12 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
15861590
);
15871591

15881592
final annotationMap = <String, Object?>{};
1589-
for (final dart_ast.Expression expression in proxyApiAnnotation.arguments!.arguments) {
1590-
if (expression is dart_ast.NamedExpression) {
1591-
annotationMap[expression.name.label.name] = _expressionToMap(expression.expression);
1593+
final dart_ast.ArgumentList? arguments = proxyApiAnnotation.arguments;
1594+
if (arguments != null) {
1595+
for (final dart_ast.Argument argument in arguments.arguments) {
1596+
if (argument is dart_ast.NamedArgument) {
1597+
annotationMap[argument.name.lexeme] = _expressionToMap(argument.argumentExpression);
1598+
}
15921599
}
15931600
}
15941601

@@ -1677,9 +1684,12 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
16771684
);
16781685

16791686
final annotationMap = <String, Object?>{};
1680-
for (final dart_ast.Expression expression in annotation.arguments!.arguments) {
1681-
if (expression is dart_ast.NamedExpression) {
1682-
annotationMap[expression.name.label.name] = _expressionToMap(expression.expression);
1687+
final dart_ast.ArgumentList? arguments = annotation.arguments;
1688+
if (arguments != null) {
1689+
for (final dart_ast.Argument argument in arguments.arguments) {
1690+
if (argument is dart_ast.NamedArgument) {
1691+
annotationMap[argument.name.lexeme] = _expressionToMap(argument.argumentExpression);
1692+
}
16831693
}
16841694
}
16851695

@@ -1744,8 +1754,6 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
17441754
String? defaultValue,
17451755
}) {
17461756
final dart_ast.NamedType? parameter = _getFirstChildOfType<dart_ast.NamedType>(formalParameter);
1747-
final dart_ast.SimpleFormalParameter? simpleFormalParameter =
1748-
_getFirstChildOfType<dart_ast.SimpleFormalParameter>(formalParameter);
17491757
if (parameter != null) {
17501758
final String argTypeBaseName = _getNamedTypeQualifiedName(parameter);
17511759
final isNullable = parameter.question != null;
@@ -1764,21 +1772,7 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
17641772
isOptional: isOptional ?? formalParameter.isOptional,
17651773
isPositional: isPositional ?? formalParameter.isPositional,
17661774
isRequired: isRequired ?? formalParameter.isRequired,
1767-
defaultValue: defaultValue,
1768-
);
1769-
} else if (simpleFormalParameter != null) {
1770-
String? defaultValue;
1771-
if (formalParameter is dart_ast.DefaultFormalParameter) {
1772-
defaultValue = formalParameter.defaultValue?.toString();
1773-
}
1774-
1775-
return _formalParameterToPigeonParameter(
1776-
simpleFormalParameter,
1777-
isNamed: simpleFormalParameter.isNamed,
1778-
isOptional: simpleFormalParameter.isOptional,
1779-
isPositional: simpleFormalParameter.isPositional,
1780-
isRequired: simpleFormalParameter.isRequired,
1781-
defaultValue: defaultValue,
1775+
defaultValue: defaultValue ?? formalParameter.defaultClause?.value.toString(),
17821776
);
17831777
} else {
17841778
return Parameter(
@@ -1836,9 +1830,9 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
18361830
)?.arguments;
18371831
final String? taskQueueTypeName = taskQueueArguments == null
18381832
? null
1839-
: _getFirstChildOfType<dart_ast.NamedExpression>(
1833+
: _getFirstChildOfType<dart_ast.NamedArgument>(
18401834
taskQueueArguments,
1841-
)?.expression.asNullable<dart_ast.PrefixedIdentifier>()?.name;
1835+
)?.argumentExpression.asNullable<dart_ast.PrefixedIdentifier>()?.name;
18421836
final TaskQueueType taskQueueType =
18431837
_stringToEnum(TaskQueueType.values, taskQueueTypeName) ?? TaskQueueType.serial;
18441838

@@ -2077,10 +2071,8 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
20772071
);
20782072
} else {
20792073
for (final dart_ast.FormalParameter param in node.parameters.parameters) {
2080-
if (param is dart_ast.DefaultFormalParameter) {
2081-
if (param.name != null && param.defaultValue != null) {
2082-
_currentClassDefaultValues[param.name!.toString()] = param.defaultValue!.toString();
2083-
}
2074+
if (param.name != null && param.defaultClause != null) {
2075+
_currentClassDefaultValues[param.name!.lexeme] = param.defaultClause!.value.toString();
20842076
}
20852077
}
20862078
}
@@ -2115,9 +2107,9 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
21152107
)?.arguments;
21162108
final String? taskQueueTypeName = taskQueueArguments == null
21172109
? null
2118-
: _getFirstChildOfType<dart_ast.NamedExpression>(
2110+
: _getFirstChildOfType<dart_ast.NamedArgument>(
21192111
taskQueueArguments,
2120-
)?.expression.asNullable<dart_ast.PrefixedIdentifier>()?.name;
2112+
)?.argumentExpression.asNullable<dart_ast.PrefixedIdentifier>()?.name;
21212113
final TaskQueueType taskQueueType =
21222114
_stringToEnum(TaskQueueType.values, taskQueueTypeName) ?? TaskQueueType.serial;
21232115

‎packages/pigeon/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: pigeon
22
description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
33
repository: https://github.com/flutter/packages/tree/main/packages/pigeon
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
5-
version: 27.3.0 # This must match the version in lib/src/generator_tools.dart
5+
version: 27.3.1 # This must match the version in lib/src/generator_tools.dart
66

77
environment:
8-
sdk: ^3.10.0
8+
sdk: ^3.11.0
99

1010
dependencies:
11-
analyzer: ">=10.0.0 <13.0.0"
11+
analyzer: ">=13.0.0 <15.0.0"
1212
args: ^2.5.0
1313
code_builder: ^4.10.0
1414
collection: ^1.15.0

0 commit comments

Comments
 (0)