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

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

Issue 1625543002: Use the explicit string 'void' to refer to void in summaries. (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
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 2affb6a7a607e12a31907f9a5a1d9721c9215ca2..29e5afe7df6f469d7b02d72b30242cdf19580a41 100644
--- a/pkg/analyzer/lib/src/summary/summarize_ast.dart
+++ b/pkg/analyzer/lib/src/summary/summarize_ast.dart
@@ -445,7 +445,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
if (!isTopLevel) {
b.isStatic = isStatic;
}
- b.returnType = serializeTypeName(returnType, allowVoid: true);
+ b.returnType = serializeTypeName(returnType);
b.hasImplicitReturnType = returnType == null;
b.isExternal = isExternal;
if (formalParameters != null) {
@@ -465,8 +465,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
*/
void serializeFunctionTypedParameterDetails(UnlinkedParamBuilder b,
TypeName returnType, FormalParameterList parameters) {
- EntityRefBuilder serializedReturnType =
- serializeTypeName(returnType, allowVoid: true);
+ EntityRefBuilder serializedReturnType = serializeTypeName(returnType);
if (serializedReturnType != null) {
b.type = serializedReturnType;
}
@@ -520,7 +519,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
* a [EntityRef]. Note that this method does the right thing if the
* name doesn't refer to an entity other than a type (e.g. a class member).
*/
- EntityRefBuilder serializeTypeName(TypeName node, {bool allowVoid: false}) {
+ EntityRefBuilder serializeTypeName(TypeName node) {
EntityRefBuilder b = new EntityRefBuilder();
if (node == null) {
b.reference = serializeReference(null, 'dynamic');
@@ -548,9 +547,6 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
indexOffset += scope.length;
}
}
- if (allowVoid && name == 'void') {
- return null;
- }
b.reference = serializeReference(null, name);
} else if (identifier is PrefixedIdentifier) {
int prefixIndex = prefixIndices.putIfAbsent(identifier.prefix.name,
@@ -762,8 +758,7 @@ class _SummarizeAstVisitor extends SimpleAstVisitor {
b.nameOffset = node.name.offset;
b.typeParameters =
serializeTypeParameters(node.typeParameters, typeParameterScope);
- EntityRefBuilder serializedReturnType =
- serializeTypeName(node.returnType, allowVoid: true);
+ EntityRefBuilder serializedReturnType = serializeTypeName(node.returnType);
if (serializedReturnType != null) {
b.returnType = serializedReturnType;
}
« no previous file with comments | « pkg/analyzer/lib/src/summary/resynthesize.dart ('k') | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698