Version 2.12.0-149.0.dev

Merge commit '4ef857e5d8fcfd9826844ea3ad075dc6fa4a8e5d' into 'dev'

Author: Dart CI

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -55,8 +55,6 @@ class LibraryContext {
   AnalysisContextImpl analysisContext;
   LinkedElementFactory elementFactory;
 
-  Set<LibraryCycle> loadedBundles = Set<LibraryCycle>.identity();
-
   LibraryContext({
     @required this.testView,
     @required AnalysisSessionImpl session,
@@ -112,7 +110,10 @@ class LibraryContext {
     var thisLoadLogBuffer = StringBuffer();
 
     void loadBundle(LibraryCycle cycle, String debugPrefix) {
-      if (!loadedBundles.add(cycle)) return;
+      if (cycle.libraries.isEmpty ||
+          elementFactory.hasLibrary(cycle.libraries.first.uriStr)) {
+        return;
+      }
 
       thisLoadLogBuffer.writeln('$debugPrefix$cycle');
 
@@ -193,9 +194,6 @@ class LibraryContext {
                   buffer.writeln('[cycle: $cycle]');
                   buffer.writeln();
 
-                  buffer.writeln('[loadedBundles: ${loadedBundles.toList()}]');
-                  buffer.writeln();
-
                   buffer.writeln('Bundles loaded in this load2() invocation:');
                   buffer.writeln(thisLoadLogBuffer);
                   buffer.writeln();

pkg/analyzer/lib/src/summary2/linked_element_factory.dart

@@ -381,6 +381,10 @@ class LinkedElementFactory {
     return library.exports;
   }
 
+  bool hasLibrary(String uriStr) {
+    return libraryReaders[uriStr] != null;
+  }
+
   bool isLibraryUri(String uriStr) {
     var libraryContext = libraryReaders[uriStr];
     return !libraryContext.hasPartOfDirective;

pkg/analyzer/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   collection: ^1.10.1
   convert: ^2.0.0
   crypto: ^2.0.0
-  glob: ^1.0.3
+  glob: '>=1.0.3 <3.0.0'
   meta: ^1.2.3
   package_config: ^1.0.0
   path: ^1.0.0

pkg/analyzer/test/src/summary/element_text.dart

@@ -57,7 +57,6 @@ void checkElementText(
   bool withSyntheticFields = false,
   bool withTypes = false,
   bool withTypeParameterVariance = false,
-  bool annotateNullability = false,
 }) {
   var writer = _ElementWriter(
     selfUriStr: '${library.source.uri}',
@@ -70,7 +69,6 @@ void checkElementText(
     withSyntheticFields: withSyntheticFields,
     withTypes: withTypes,
     withTypeParameterVariance: withTypeParameterVariance,
-    annotateNullability: annotateNullability,
   );
   writer.writeLibraryElement(library);
 
@@ -140,7 +138,6 @@ class _ElementWriter {
   final bool withSyntheticFields;
   final bool withTypes;
   final bool withTypeParameterVariance;
-  final bool annotateNullability;
   final StringBuffer buffer = StringBuffer();
 
   String indent = '';
@@ -156,7 +153,6 @@ class _ElementWriter {
     this.withSyntheticFields = false,
     this.withTypes = false,
     this.withTypeParameterVariance,
-    this.annotateNullability = false,
   });
 
   bool isDynamicType(DartType type) => type is DynamicTypeImpl;
@@ -1176,7 +1172,7 @@ class _ElementWriter {
 
   String _typeStr(DartType type) {
     return type?.getDisplayString(
-      withNullability: annotateNullability,
+      withNullability: true,
     );
   }
 
@@ -1216,7 +1212,7 @@ class _ElementWriter {
         selfUriStr: selfUriStr,
         sink: buffer,
         indent: indent,
-        withNullability: annotateNullability,
+        withNullability: true,
       ),
     );
   }

pkg/analyzer/test/src/summary/resynthesize_ast2_test.dart

@@ -122,7 +122,7 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
   }
 
   void setUp() {
-    featureSet = FeatureSets.beforeNullSafe;
+    featureSet = FeatureSets.nullSafe;
   }
 
   void _addLibraryUnits(