Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: pkg/analyzer/lib/src/summary/summarize_ast.dart

Issue 1602263002: Fix summarization of trailing `dynamic` type arguments. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/summarize_ast.dart
diff --git a/pkg/analyzer/lib/src/summary/summarize_ast.dart b/pkg/analyzer/lib/src/summary/summarize_ast.dart
index c0b0df5a6232403cd6ab4f88fb36b70eeb40b371..385567f3d031eab151d640ec69a2ba93e0eb58f2 100644
--- a/pkg/analyzer/lib/src/summary/summarize_ast.dart
+++ b/pkg/analyzer/lib/src/summary/summarize_ast.dart
@@ -512,10 +512,20 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
throw new StateError(
'Unexpected identifier type: ${identifier.runtimeType}');
}
- if (node.typeArguments != null &&
- node.typeArguments.arguments.any(isNotDynamic)) {
- b.typeArguments =
- node.typeArguments.arguments.map(serializeTypeName).toList();
+ if (node.typeArguments != null) {
+ // Trailing type arguments of type 'dynamic' should be omitted.
+ NodeList<TypeName> args = node.typeArguments.arguments;
+ int numArgsToSerialize = args.length;
+ while (numArgsToSerialize > 0 && isDynamic(args[numArgsToSerialize - 1])) {
+ --numArgsToSerialize;
+ }
+ if (numArgsToSerialize > 0) {
+ List<UnlinkedTypeRefBuilder> serializedArguments = <UnlinkedTypeRefBuilder>[];
+ for (int i = 0; i < numArgsToSerialize; i++) {
+ serializedArguments.add(serializeTypeName(args[i]));
+ }
+ b.typeArguments = serializedArguments;
+ }
}
}
return b;
@@ -796,9 +806,9 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
/**
* Helper method to determine if a given [typeName] refers to `dynamic`.
*/
- static bool isNotDynamic(TypeName typeName) {
+ static bool isDynamic(TypeName typeName) {
Identifier name = typeName.name;
- return !(name is SimpleIdentifier && name.name == 'dynamic');
+ return name is SimpleIdentifier && name.name == 'dynamic';
}
}
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698