Version 2.12.0-177.0.dev

Merge commit '03adde55558d274ca11a11374629eb5ab817d4be' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -1085,6 +1085,9 @@ class FixProcessor extends BaseProcessor {
     StaticWarningCode.INVALID_NULL_AWARE_OPERATOR: [
       ReplaceWithNotNullAware.newInstance,
     ],
+    StaticWarningCode.INVALID_NULL_AWARE_OPERATOR_AFTER_SHORT_CIRCUIT: [
+      ReplaceWithNotNullAware.newInstance,
+    ],
     StaticWarningCode.MISSING_ENUM_CONSTANT_IN_SWITCH: [
       AddMissingEnumCaseClauses.newInstance,
     ],

pkg/analysis_server/test/src/services/correction/fix/replace_with_not_null_aware_test.dart

@@ -137,6 +137,22 @@ class C {
 ''');
   }
 
+  Future<void> test_shortCircuit() async {
+    await resolveTestCode('''
+class C {
+  C a(C? c) => c?.b?.b ?? this;
+  C get b => this;
+}
+''');
+
+    await assertHasFix('''
+class C {
+  C a(C? c) => c?.b.b ?? this;
+  C get b => this;
+}
+''');
+  }
+
   Future<void> test_spread() async {
     await resolveTestCode('''
 void f(List<int> x) {

pkg/front_end/lib/src/base/processed_options.dart

@@ -400,7 +400,8 @@ class ProcessedOptions {
       if (sdkSummary == null) return null;
       List<int> bytes = await loadSdkSummaryBytes();
       if (bytes != null && bytes.isNotEmpty) {
-        _sdkSummaryComponent = loadComponent(bytes, nameRoot);
+        _sdkSummaryComponent =
+            loadComponent(bytes, nameRoot, fileUri: sdkSummary);
       }
     }
     return _sdkSummaryComponent;
@@ -424,10 +425,13 @@ class ProcessedOptions {
       // TODO(sigmund): throttle # of concurrent operations.
       List<List<int>> allBytes = await Future.wait(
           uris.map((uri) => _readAsBytes(fileSystem.entityForUri(uri))));
-      _additionalDillComponents = allBytes
-          .where((bytes) => bytes != null)
-          .map((bytes) => loadComponent(bytes, nameRoot))
-          .toList();
+      List<Component> result = [];
+      for (int i = 0; i < uris.length; i++) {
+        if (allBytes[i] == null) continue;
+        List<int> bytes = allBytes[i];
+        result.add(loadComponent(bytes, nameRoot, fileUri: uris[i]));
+      }
+      _additionalDillComponents = result;
     }
     return _additionalDillComponents;
   }
@@ -442,13 +446,12 @@ class ProcessedOptions {
 
   /// Helper to load a .dill file from [uri] using the existing [nameRoot].
   Component loadComponent(List<int> bytes, CanonicalName nameRoot,
-      {bool alwaysCreateNewNamedNodes}) {
+      {bool alwaysCreateNewNamedNodes, Uri fileUri}) {
     Component component =
         target.configureComponent(new Component(nameRoot: nameRoot));
-    // TODO(ahe): Pass file name to BinaryBuilder.
     // TODO(ahe): Control lazy loading via an option.
     new BinaryBuilder(bytes,
-            filename: null,
+            filename: fileUri == null ? null : '$fileUri',
             disableLazyReading: false,
             alwaysCreateNewNamedNodes: alwaysCreateNewNamedNodes)
         .readComponent(component);

pkg/kernel/lib/binary/ast_from_binary.dart

@@ -24,13 +24,19 @@ class ParseError {
 }
 
 class InvalidKernelVersionError {
+  final String filename;
   final int version;
 
-  InvalidKernelVersionError(this.version);
+  InvalidKernelVersionError(this.filename, this.version);
 
   String toString() {
-    return 'Unexpected Kernel Format Version ${version} '
-        '(expected ${Tag.BinaryFormatVersion}).';
+    StringBuffer sb = new StringBuffer();
+    sb.write('Unexpected Kernel Format Version ${version} '
+        '(expected ${Tag.BinaryFormatVersion})');
+    if (filename != null) {
+      sb.write(' when reading $filename.');
+    }
+    return '$sb';
   }
 }
 
@@ -529,7 +535,7 @@ class BinaryBuilder {
       }
       int version = readUint32();
       if (version != Tag.BinaryFormatVersion) {
-        throw InvalidKernelVersionError(version);
+        throw InvalidKernelVersionError(filename, version);
       }
 
       _readAndVerifySdkHash();
@@ -717,7 +723,7 @@ class BinaryBuilder {
 
     final int formatVersion = readUint32();
     if (formatVersion != Tag.BinaryFormatVersion) {
-      throw InvalidKernelVersionError(formatVersion);
+      throw InvalidKernelVersionError(filename, formatVersion);
     }
 
     _readAndVerifySdkHash();
@@ -743,7 +749,7 @@ class BinaryBuilder {
 
     final int formatVersion = readUint32();
     if (formatVersion != Tag.BinaryFormatVersion) {
-      throw InvalidKernelVersionError(formatVersion);
+      throw InvalidKernelVersionError(filename, formatVersion);
     }
 
     _readAndVerifySdkHash();

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 12
 PATCH 0
-PRERELEASE 176
+PRERELEASE 177
 PRERELEASE_PATCH 0