Version 2.12.0-14.0.dev

Merge commit '6cfd46e177c1d62ed77e598d1468896919d3403f' into 'dev'

Author: Dart CI

CHANGELOG.md

@@ -39,6 +39,11 @@ opted out of null safety by adding `// @dart=2.9` to the beginning of the file.
   `--enable-assert-initializers` command line options. These options haven't
   been supported in a while and were no-ops.
 
+#### dartfmt
+
+* Don't duplicate comments on chained if elements.
+* Preserve `?` in initializing formal function-typed parameters.
+
 #### Linter
 
 Updated the Linter to `0.1.122`, which includes:

DEPS

@@ -98,7 +98,7 @@ vars = {
   #     and land the review.
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164
-"dart_style_tag": "1.3.8+1",  # Please see the note above before updating.
+"dart_style_tag": "1.3.9",  # Please see the note above before updating.
 
   "chromedriver_tag": "83.0.4103.39",
   "dartdoc_rev" : "72c69f8659ce8823ce2dde9a4f758b0fa617ab5e",

pkg/dart_internal/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.12-nullsafety.1
+
+- Support the latest Dart SDK.
+
 ## 0.1.10
 
 - Support the latest Dart SDK.

pkg/dart_internal/pubspec.yaml

@@ -1,7 +1,5 @@
 name: dart_internal
-version: 0.1.12-nullsafety
-author: "Dart Team <[email protected]>"
-homepage: http://www.dartlang.org
+version: 0.1.12-nullsafety.1
 repository: https://github.com/dart-lang/sdk/tree/master/pkg/dart_internal
 description: >
   This package is not intended for wide use. It provides a temporary API to
@@ -18,4 +16,4 @@ description: >
 environment:
   # Restrict the upper bound so that we can remove support for this in a later
   # version of the SDK without it being a breaking change.
-  sdk: ">=2.10.0-0 <2.11.0"
+  sdk: ">=2.10.0-0 <2.12.0"

pkg/dev_compiler/lib/src/kernel/compiler.dart

@@ -581,11 +581,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
 
     var finishGenericTypeTest = _emitClassTypeTests(c, className, body);
 
-    // Attach caches on all canonicalized types not in our runtime.
-    // Types in the runtime will have caches attached in their constructors.
-    if (!isSdkInternalRuntime(_currentLibrary)) {
-      body.add(runtimeStatement('addTypeCaches(#)', [className]));
-    }
+    // Attach caches on all canonicalized types.
+    body.add(runtimeStatement('addTypeCaches(#)', [className]));
 
     _emitVirtualFieldSymbols(c, body);
     _emitClassSignature(c, className, body);
@@ -1082,29 +1079,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
     }
 
     if (c == _coreTypes.deprecatedFutureOrClass) {
-      // These methods are difficult to place in the runtime or patch files.
-      // * They need to be callable from the class but they can't be static
-      //   methods on the FutureOr class in Dart because they reference the
-      //   generic type parameter.
-      // * There isn't an obvious place in dart:_runtime were we could place a
-      //   method that adds these type tests (similar to addTypeTests()) because
-      //   in the bootstrap ordering the Future class hasn't been defined yet.
-      var typeParam =
-          TypeParameterType(c.typeParameters[0], Nullability.undetermined);
-      var typeT = visitTypeParameterType(typeParam);
-      var futureOfT = visitInterfaceType(InterfaceType(
-          _coreTypes.futureClass, currentLibrary.nonNullable, [typeParam]));
-      body.add(js.statement('''
-          #.is = function is_FutureOr(o) {
-            return #.is(o) || #.is(o);
-          }
-          ''', [className, typeT, futureOfT]));
-      body.add(js.statement('''
-          #.as = function as_FutureOr(o) {
-            if (#.is(o) || #.is(o)) return o;
-            return #.as(o, this);
-          }
-          ''', [className, typeT, futureOfT, runtimeModule]));
+      // Custom type tests for FutureOr types are attached when the type is
+      // constructed in the runtime normalizeFutureOr method.
       return null;
     }
 

pkg/nnbd_migration/lib/src/edit_plan.dart

@@ -495,11 +495,11 @@ class EditPlanner {
     }
   }
 
-  /// Creates a new edit plan that removes [node] from the AST.
+  /// Creates a new edit plan that removes [sourceNode] from the AST.
   ///
-  /// [node] must be one element of a variable length sequence maintained by
-  /// [node]'s parent (for example, a statement in a block, an element in a
-  /// list, a declaration in a class, etc.).  If it is not, an exception is
+  /// [sourceNode] must be one element of a variable length sequence maintained
+  /// by [sourceNode]'s parent (for example, a statement in a block, an element
+  /// in a list, a declaration in a class, etc.).  If it is not, an exception is
   /// thrown.
   ///
   /// Optional argument [info] contains information about why the change was
@@ -674,9 +674,10 @@ class EditPlanner {
   ///
   /// Optional argument [info] contains information about why the change was
   /// made.
-  EditPlan tryRemoveNode(AstNode sourceNode, {AtomicEditInfo info}) {
+  EditPlan tryRemoveNode(AstNode sourceNode,
+      {List<AstNode> sequenceNodes, AtomicEditInfo info}) {
     var parent = sourceNode.parent;
-    var sequenceNodes = _computeSequenceNodes(parent);
+    sequenceNodes ??= _computeSequenceNodes(parent);
     if (sequenceNodes == null) {
       return null;
     }
@@ -809,6 +810,8 @@ class EditPlanner {
       return node.elements;
     } else if (node is ArgumentList) {
       return node.arguments;
+    } else if (node is FormalParameter) {
+      return node.metadata;
     } else if (node is FormalParameterList) {
       return node.parameters;
     } else if (node is VariableDeclarationList) {
@@ -1525,7 +1528,8 @@ class _PassThroughBuilderImpl implements PassThroughBuilder {
       AstNode parent, List<AstNode> childNodes) {
     if (parent is Block ||
         parent is ClassDeclaration ||
-        parent is CompilationUnit) {
+        parent is CompilationUnit ||
+        parent is FormalParameter) {
       // These parent types don't use separators.
       return null;
     } else {

pkg/nnbd_migration/lib/src/fix_aggregator.dart

@@ -666,6 +666,14 @@ class NodeChangeForDefaultFormalParameter
   /// contained in the edit.
   AtomicEditInfo addRequiredKeywordInfo;
 
+  /// If non-null, indicates a `@required` annotation which should be removed
+  /// from this node.
+  Annotation annotationToRemove;
+
+  /// If [annotationToRemove] is non-null, the information that should be
+  /// contained in the edit.
+  AtomicEditInfo removeAnnotationInfo;
+
   NodeChangeForDefaultFormalParameter() : super._();
 
   @override
@@ -676,8 +684,17 @@ class NodeChangeForDefaultFormalParameter
   EditPlan _apply(DefaultFormalParameter node, FixAggregator aggregator) {
     var innerPlan = aggregator.innerPlanForNode(node);
     if (!addRequiredKeyword) return innerPlan;
-    return aggregator.planner.surround(innerPlan,
-        prefix: [AtomicEdit.insert('required ', info: addRequiredKeywordInfo)]);
+
+    var offset = node.firstTokenAfterCommentAndMetadata.offset;
+    return aggregator.planner.passThrough(node, innerPlans: [
+      aggregator.planner.insertText(node, offset, [
+        AtomicEdit.insert('required ', info: addRequiredKeywordInfo),
+      ]),
+      if (annotationToRemove != null)
+        aggregator.planner
+            .removeNode(annotationToRemove, info: removeAnnotationInfo),
+      ...aggregator.innerPlansForNode(node),
+    ]);
   }
 }
 

pkg/nnbd_migration/lib/src/fix_builder.dart

@@ -1145,20 +1145,33 @@ class _FixBuilderPreVisitor extends GeneralizingAstVisitor<void>
             cls.name, method.name, element.name),
         {FixReasonTarget.root: node});
     var metadata = parameter.metadata;
-    for (var annotation in metadata) {
-      if (annotation.elementAnnotation.isRequired) {
-        // TODO(paulberry): what if `@required` isn't the first annotation?
-        // Will we produce something that isn't grammatical?
-        (_fixBuilder._getChange(annotation) as NodeChangeForAnnotation)
+    if (metadata != null && metadata.isNotEmpty) {
+      // Only the last annotation can be changed into a `required` keyword;
+      // changing an earlier annotation into a keyword would be illegal.
+      var lastAnnotation = metadata.last;
+      if (lastAnnotation.elementAnnotation.isRequired) {
+        (_fixBuilder._getChange(lastAnnotation) as NodeChangeForAnnotation)
           ..changeToRequiredKeyword = true
           ..changeToRequiredKeywordInfo = info;
         return;
       }
     }
     // Otherwise create a new `required` keyword.
-    (_fixBuilder._getChange(parameter) as NodeChangeForDefaultFormalParameter)
+    var nodeChange = (_fixBuilder._getChange(parameter)
+        as NodeChangeForDefaultFormalParameter)
       ..addRequiredKeyword = true
       ..addRequiredKeywordInfo = info;
+    var requiredAnnotation = metadata?.firstWhere(
+        (annotation) => annotation.elementAnnotation.isRequired,
+        orElse: () => null);
+    if (requiredAnnotation != null) {
+      // If the parameter was annotated with `@required`, but it was not the
+      // last annotation, we remove the annotation in addition to adding the
+      // `required` keyword.
+      nodeChange
+        ..annotationToRemove = requiredAnnotation
+        ..removeAnnotationInfo = info;
+    }
   }
 
   void _makeTypeNameNullable(TypeAnnotation node, DecoratedType decoratedType) {

pkg/nnbd_migration/lib/src/node_builder.dart

@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:_fe_analyzer_shared/src/scanner/token.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -894,40 +893,3 @@ class NodeBuilder extends GeneralizingAstVisitor<DecoratedType>
     throw UnimplementedError(buffer.toString());
   }
 }
-
-extension on FormalParameter {
-  // TODO(srawlins): Add this to FormalParameter interface.
-  Token get firstTokenAfterCommentAndMetadata {
-    var parameter = this is DefaultFormalParameter
-        ? (this as DefaultFormalParameter).parameter
-        : this as NormalFormalParameter;
-    if (parameter is FieldFormalParameter) {
-      if (parameter.keyword != null) {
-        return parameter.keyword;
-      } else if (parameter.type != null) {
-        return parameter.type.beginToken;
-      } else {
-        return parameter.thisKeyword;
-      }
-    } else if (parameter is FunctionTypedFormalParameter) {
-      if (parameter.covariantKeyword != null) {
-        return parameter.covariantKeyword;
-      } else if (parameter.returnType != null) {
-        return parameter.returnType.beginToken;
-      } else {
-        return parameter.identifier.token;
-      }
-    } else if (parameter is SimpleFormalParameter) {
-      if (parameter.covariantKeyword != null) {
-        return parameter.covariantKeyword;
-      } else if (parameter.keyword != null) {
-        return parameter.keyword;
-      } else if (parameter.type != null) {
-        return parameter.type.beginToken;
-      } else {
-        return parameter.identifier.token;
-      }
-    }
-    return null;
-  }
-}

pkg/nnbd_migration/lib/src/utilities/hint_utils.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:_fe_analyzer_shared/src/scanner/token.dart';
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:nnbd_migration/src/edit_plan.dart';
 
 /// Determines if the given [token] is followed by a nullability hint, and if
@@ -226,3 +227,40 @@ enum HintCommentKind {
   /// required.
   required,
 }
+
+extension FormalParameterExtensions on FormalParameter {
+  // TODO(srawlins): Add this to FormalParameter interface.
+  Token get firstTokenAfterCommentAndMetadata {
+    var parameter = this is DefaultFormalParameter
+        ? (this as DefaultFormalParameter).parameter
+        : this as NormalFormalParameter;
+    if (parameter is FieldFormalParameter) {
+      if (parameter.keyword != null) {
+        return parameter.keyword;
+      } else if (parameter.type != null) {
+        return parameter.type.beginToken;
+      } else {
+        return parameter.thisKeyword;
+      }
+    } else if (parameter is FunctionTypedFormalParameter) {
+      if (parameter.covariantKeyword != null) {
+        return parameter.covariantKeyword;
+      } else if (parameter.returnType != null) {
+        return parameter.returnType.beginToken;
+      } else {
+        return parameter.identifier.token;
+      }
+    } else if (parameter is SimpleFormalParameter) {
+      if (parameter.covariantKeyword != null) {
+        return parameter.covariantKeyword;
+      } else if (parameter.keyword != null) {
+        return parameter.keyword;
+      } else if (parameter.type != null) {
+        return parameter.type.beginToken;
+      } else {
+        return parameter.identifier.token;
+      }
+    }
+    return null;
+  }
+}