languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 01:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for 'Never' in dart:core and summary1.

Browse source 
We should add it only to the defining unit of dart:core, otherwise
we get it in every unit, which is a conflict, and it is still
unresolved.

R=brianwilkerson@google.com, paulberry@google.com

Change-Id: Ief28b949cc0fe1ed71c91a4efa679d15fbb26a6d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110129
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2019-07-23 21:35:22 +00:00 committed by commit-bot@chromium.org
parent 71cd8a6efa
commit 2ada1edb59
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/analyzer/lib/src/summary/summarize_ast.dart
View file

@ -293,6 +293,9 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
/// True if the 'dart:core' library is been summarized.
bool isCoreLibrary = false;
/// True if the 'dart:core' library defining unit is been summarized.
bool isCoreLibraryDefiningUnit = false;
/// True is a [PartOfDirective] was found, so the unit is a part.
bool isPartOf = false;
@ -518,7 +521,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
b.variables = variables;
b.publicNamespace = computePublicNamespace(compilationUnit);
if (isCoreLibrary) {
if (isCoreLibraryDefiningUnit) {
b.publicNamespace.names.add(
UnlinkedPublicNameBuilder(
name: 'Never',
@ -1395,6 +1398,7 @@ class _SummarizeAstVisitor extends RecursiveAstVisitor {
libraryNameOffset = node.name.offset;
libraryNameLength = node.name.length;
isCoreLibrary = libraryName == 'dart.core';
isCoreLibraryDefiningUnit = isCoreLibrary;
libraryDocumentationComment =
serializeDocumentation(node.documentationComment);
libraryAnnotations = serializeAnnotations(node.metadata);