Version 2.18.0-247.0.dev

Merge commit 'd2a3849f92ff99b29fcf3d8ab093f4a4f5df5446' into 'dev'

Author: Dart CI

.gitignore

@@ -75,9 +75,8 @@ client/tests/drt
 packages
 pubspec.lock
 
-# The top level package files (these are auto-generated per checkout)
+# The top level package file (this is auto-generated per checkout).
 /.dart_tool/package_config.json
-/.packages
 
 # Local pub storage
 .pub

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 2.19.0
 
+#### Dart command line
+
+- **Breaking change** [#46100](https://github.com/dart-lang/sdk/issues/46100):
+  The standalone `dartanalyzer` tool has been removed as previously
+  announced. `dartanalyzer` is replaced by the `dart analyze` command.
+
 ### Language
 
 - **Breaking Change** [#48167](https://github.com/dart-lang/sdk/issues/48167):

DEPS

@@ -108,7 +108,7 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "d7b73536a8079331c888b7da539b80e6825270ea", # manually rev'd
 
-  "dartdoc_rev": "d8195107d3e65e20094bb2ca0a8e8576e3a765bf",
+  "dartdoc_rev": "900432d8cb1e75c4f28c79d94c3036fd3b3ec21d",
   "devtools_rev": "0aa619c42a68d6db4c94a7838121811aba8f5eb1",
   "ffi_rev": "18b2b549d55009ff594600b04705ff6161681e07",
   "file_rev": "0132eeedea2933513bf230513a766a8baeab0c4f",
@@ -135,7 +135,7 @@ vars = {
   "path_rev": "7a0ed40280345b1c11df4c700c71e590738f4257",
   "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
   "pool_rev": "fa84ddd0e39f45bf3f09dcc5d6b9fbdda7820fef",
-  "protobuf_rev": "7ac39080eb886e6eec55983dcba76e855c038701",
+  "protobuf_rev": "66593ca5a4d163b2f9a469a2b6368e12a710e550",
   "pub_rev": "9bf4289d6fd5d6872a8929d6312bbd7098f3ea9c", # manually rev'd
   "pub_semver_rev": "5c0b4bfd5ca57fe16f1319c581dc8c882e9b8cb2",
   "root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",
@@ -153,15 +153,15 @@ vars = {
   "test_descriptor_rev": "5ed5d7f6bf1191592995dcb8eedbbc17df69d386",
   "test_process_rev": "3e695bcfeab551473ddc288970f345f30e5e1375",
   "test_reflective_loader_rev": "8d0de01bbe852fea1f8e33aba907abcba50a8a1e",
-  "test_rev": "6d656f60f2c486efce5f4f22ff00dbb037a825f1",
+  "test_rev": "ed73bb93b06280cd47108d202cd96bcf3494df65",
   "typed_data_rev": "bb10b64f9a56b8fb49307d4465474bf1c1309f6d",
   "usage_rev": "1d3c31e780af665fb796a27898a441fcb7d263db",
   "vector_math_rev": "cdcee487bde4353a6ba7a29bfc7db3840426e50f",
   "watcher_rev": "e00c0ea769e32821d91c0880da8eb736839a6e6d",
   "web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
   "web_socket_channel_rev": "99dbdc5769e19b9eeaf69449a59079153c6a8b1f",
   "WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",
-  "webdev_rev": "b0a4059dcdfb3af2a011cbefc5eb21fb0cfd8032",
+  "webdev_rev": "9c4428472b04f50748ea4871829897cff43455a3",
   "webdriver_rev": "e1a9ad671ee82e05eee463f922a34585ed2d2f15",
   "webkit_inspection_protocol_rev": "57522d6b29d94903b765c757079d906555d5a171",
   "yaml_edit_rev": "01589b3ce447b03aed991db49f1ec6445ad5476d",

README.dart-sdk

@@ -9,7 +9,6 @@ bin/               Binaries/scripts to compile, run, and manage Dart apps.
   dartaotruntime   Minimal Dart runtime for running AOT modules
   dart2js          Dart to JavaScript production compiler
   dartdevc         Dart to Javascript development compiler
-  dartanalyzer     Dart static analyzer
   dartdoc          Dart documentation generator
 
 include/           header files that define the Dart embedding API for use by

pkg/analyzer/CHANGELOG.md

@@ -478,7 +478,7 @@
 * Deprecated `AstFactory.indexExpressionForTarget()`.  Please use
   `indexExpressionForTarget2` instead.
 * Deprecated `ClassElement.isOrInheritsProxy` and `ClassElement.isProxy`.  The
-  `@proxy` annotation is deprecated in the langauge, and will be removed.
+  `@proxy` annotation is deprecated in the language, and will be removed.
 * Added new error codes: BODY_MIGHT_COMPLETE_NORMALLY,
   CASE_EXPRESSION_TYPE_IS_NOT_SWITCH_EXPRESSION_SUBTYPE,
   DEFINITELY_UNASSIGNED_LATE_LOCAL_VARIABLE, LATE_FINAL_LOCAL_ALREADY_ASSIGNED,

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

@@ -32,6 +32,7 @@ import '../js_ast/js_ast.dart' show ModuleItem, js;
 import '../js_ast/source_map_printer.dart'
     show NodeEnd, NodeSpan, HoverComment, continueSourceMap;
 import 'constants.dart';
+import 'future_or_normalizer.dart';
 import 'js_interop.dart';
 import 'js_typerep.dart';
 import 'kernel_helpers.dart';
@@ -939,7 +940,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
           }
           return _emitInterfaceType(t, emitNullability: emitNullability);
         } else if (t is FutureOrType) {
-          var normalizedType = _normalizeFutureOr(t);
+          var normalizedType = normalizeFutureOr(t, _coreTypes);
           if (normalizedType is FutureOrType) {
             _declareBeforeUse(_coreTypes.deprecatedFutureOrClass);
             var typeRep = _emitFutureOrTypeWithArgument(
@@ -2911,64 +2912,6 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
           ? visitNullType(const NullType())
           : _emitNullabilityWrapper(runtimeCall('Never'), type.nullability);
 
-  /// Normalizes `FutureOr` types.
-  ///
-  /// Any changes to the normalization logic here should be mirrored in the
-  /// classes.dart runtime library method named `normalizeFutureOr`.
-  DartType _normalizeFutureOr(FutureOrType futureOr) {
-    var typeArgument = futureOr.typeArgument;
-    if (typeArgument is DynamicType) {
-      // FutureOr<dynamic> --> dynamic
-      return typeArgument;
-    }
-    if (typeArgument is VoidType) {
-      // FutureOr<void> --> void
-      return typeArgument;
-    }
-
-    if (typeArgument is InterfaceType &&
-        typeArgument.classNode == _coreTypes.objectClass) {
-      // Normalize FutureOr of Object, Object?, Object*.
-      var nullable = futureOr.nullability == Nullability.nullable ||
-          typeArgument.nullability == Nullability.nullable;
-      var legacy = futureOr.nullability == Nullability.legacy ||
-          typeArgument.nullability == Nullability.legacy;
-      var nullability = nullable
-          ? Nullability.nullable
-          : legacy
-              ? Nullability.legacy
-              : Nullability.nonNullable;
-      return typeArgument.withDeclaredNullability(nullability);
-    } else if (typeArgument is NeverType) {
-      // FutureOr<Never> --> Future<Never>
-      return InterfaceType(
-          _coreTypes.futureClass, futureOr.nullability, [typeArgument]);
-    } else if (typeArgument is NullType) {
-      // FutureOr<Null> --> Future<Null>?
-      return InterfaceType(
-          _coreTypes.futureClass, Nullability.nullable, [typeArgument]);
-    } else if (futureOr.declaredNullability == Nullability.nullable &&
-        typeArgument.nullability == Nullability.nullable) {
-      // FutureOr<T?>? --> FutureOr<T?>
-      return futureOr.withDeclaredNullability(Nullability.nonNullable);
-    }
-    // The following is not part of the normalization spec but this is a
-    // convenient place to perform this change of nullability consistently. This
-    // only applies at compile-time and is not needed in the runtime version of
-    // the FutureOr normalization.
-    // FutureOr<T%>% --> FutureOr<T%>
-    //
-    // If the type argument has undetermined nullability the CFE propagates
-    // it to the FutureOr type as well. In this case we can represent the
-    // FutureOr type without any nullability wrappers and rely on the runtime to
-    // handle the nullability of the instantiated type appropriately.
-    if (futureOr.nullability == Nullability.undetermined &&
-        typeArgument.nullability == Nullability.undetermined) {
-      return futureOr.withDeclaredNullability(Nullability.nonNullable);
-    }
-    return futureOr;
-  }
-
   @override
   js_ast.Expression visitInterfaceType(InterfaceType type) =>
       _emitInterfaceType(type);
@@ -2979,7 +2922,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
 
   @override
   js_ast.Expression visitFutureOrType(FutureOrType type) {
-    var normalizedType = _normalizeFutureOr(type);
+    var normalizedType = normalizeFutureOr(type, _coreTypes);
     return normalizedType is FutureOrType
         ? _emitFutureOrType(normalizedType)
         : normalizedType.accept(this);
@@ -6534,7 +6477,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
   String? _annotationName(NamedNode node, bool Function(Expression) test) {
     var annotation = findAnnotation(node, test);
     return annotation != null
-        ? _constants.getFieldValueFromAnnotation(annotation, 'name') as String
+        ? _constants.getFieldValueFromAnnotation(annotation, 'name') as String?
         : null;
   }
 

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

@@ -0,0 +1,91 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// 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:kernel/ast.dart';
+import 'package:kernel/core_types.dart';
+import 'package:kernel/kernel.dart';
+import 'package:kernel/src/replacement_visitor.dart';
+
+/// Normalizes all `FutureOr` types found in [type].
+DartType normalizeFutureOr(DartType type, CoreTypes coreTypes) =>
+    type.accept1(_FutureOrNormalizer.instance(coreTypes), Variance.unrelated) ??
+    type;
+
+/// Visit methods returns a normalized version of `FutureOr` types or `null` if
+/// no normalization was applied.
+///
+/// The `variance` parameters in the visit methods are unused in this type
+/// replacement.
+///
+/// `FutureOr` types are normalized per the spec:
+/// https://github.com/dart-lang/language/blob/master/resources/type-system/normalization.md
+///
+/// Any changes to the normalization logic here should be mirrored in the
+/// classes.dart runtime library method named `normalizeFutureOr`.
+class _FutureOrNormalizer extends ReplacementVisitor {
+  final CoreTypes _coreTypes;
+
+  static _FutureOrNormalizer? _instance;
+
+  _FutureOrNormalizer._(this._coreTypes);
+
+  factory _FutureOrNormalizer.instance(CoreTypes coreTypes) =>
+      _instance ?? (_instance = _FutureOrNormalizer._(coreTypes));
+
+  @override
+  DartType? visitFutureOrType(FutureOrType futureOr, int variance) {
+    var normalizedTypeArg = futureOr.typeArgument.accept1(this, variance);
+    var typeArgument = normalizedTypeArg ?? futureOr.typeArgument;
+    if (typeArgument is DynamicType) {
+      // FutureOr<dynamic> --> dynamic
+      return typeArgument;
+    }
+    if (typeArgument is VoidType) {
+      // FutureOr<void> --> void
+      return typeArgument;
+    }
+
+    if (typeArgument is InterfaceType &&
+        typeArgument.classNode == _coreTypes.objectClass) {
+      // Normalize FutureOr of Object, Object?, Object*.
+      var nullable = futureOr.nullability == Nullability.nullable ||
+          typeArgument.nullability == Nullability.nullable;
+      var legacy = futureOr.nullability == Nullability.legacy ||
+          typeArgument.nullability == Nullability.legacy;
+      var nullability = nullable
+          ? Nullability.nullable
+          : legacy
+              ? Nullability.legacy
+              : Nullability.nonNullable;
+      return typeArgument.withDeclaredNullability(nullability);
+    } else if (typeArgument is NeverType) {
+      // FutureOr<Never> --> Future<Never>
+      return InterfaceType(
+          _coreTypes.futureClass, futureOr.nullability, [typeArgument]);
+    } else if (typeArgument is NullType) {
+      // FutureOr<Null> --> Future<Null>?
+      return InterfaceType(
+          _coreTypes.futureClass, Nullability.nullable, [typeArgument]);
+    } else if (futureOr.declaredNullability == Nullability.nullable &&
+        typeArgument.nullability == Nullability.nullable) {
+      // FutureOr<T?>? --> FutureOr<T?>
+      return futureOr.withDeclaredNullability(Nullability.nonNullable);
+    }
+    // The following is not part of the normalization spec but this is a
+    // convenient place to perform this change of nullability consistently. This
+    // only applies at compile-time and is not needed in the runtime version of
+    // the FutureOr normalization.
+    // FutureOr<T%>% --> FutureOr<T%>
+    //
+    // If the type argument has undetermined nullability the CFE propagates
+    // it to the FutureOr type as well. In this case we can represent the
+    // FutureOr type without any nullability wrappers and rely on the runtime to
+    // handle the nullability of the instantiated type appropriately.
+    if (futureOr.declaredNullability == Nullability.undetermined &&
+        typeArgument.declaredNullability == Nullability.undetermined) {
+      return futureOr.withDeclaredNullability(Nullability.nonNullable);
+    }
+    return null;
+  }
+}

pkg/language_versioning_2.7_test/pubspec.yaml

@@ -0,0 +1,8 @@
+include: package:lints/recommended.yaml
+
+analyzer:
+  exclude:
+    # These files have intentional errors.
+    - test/lib_ex2.7_test.dart
+    - test/lib_ex2.8_test.dart
+    - test/lib_im2.7_test.dart

pkg/language_versioning_2.7_test/OWNERS renamed to pkg/language_versioning_2_7_test/OWNERS

@@ -0,0 +1,14 @@
+name: language_versioning_2_7_test
+version: 1.0.0
+description: >
+  Tests of language versioning. Stored as a package in order to have its own
+  package configuration and default language version
+
+# This package is not intended for consumption on pub.dev. DO NOT publish.
+publish_to: none
+
+environment:
+  sdk: '>=2.7.0 <3.0.0'
+
+dev_dependencies:
+  lints: any

pkg/language_versioning_2_7_test/analysis_options.yaml

@@ -8,7 +8,7 @@
 part "src/part_of_ex2.7_v_ex2.7.dart";
 
 // Specification requires the part file to have
-// the same explicit langauge version marker
+// the same explicit language version marker
 // as the including library,
 // not just the same languge version.
 part "src/part_of_ex2.7_v_im2.7.dart";

pkg/language_versioning_2_7_test/pubspec.yaml

@@ -7,7 +7,7 @@
 part "src/part_of_im2.7_v_im2.7.dart";
 
 // Specification requires the part fsrc/ile to have
-// the same explicit langauge version marker
+// the same explicit language version marker
 // as the including library,
 // not just the same languge version.
 part "src/part_of_im2.7_v_ex2.7.dart";

pkg/language_versioning_2.7_test/test/lib_ex2.7_test.dart renamed to pkg/language_versioning_2_7_test/test/lib_ex2.7_test.dart

@@ -85,7 +85,7 @@ List<String> _selectBuildTargets(Configuration inner) {
     Compiler.fasta: ['create_sdk', 'dartdevc_test', 'kernel_platform_files'],
     Compiler.dartdevk: ['dartdevc_test'],
     Compiler.dart2js: ['create_sdk'],
-    Compiler.dart2analyzer: ['create_sdk'],
+    Compiler.dart2analyzer: ['create_sdk', 'utils/dartanalyzer'],
     Compiler.specParser: <String>[],
   };
   final result = [...targetsForCompilers[compiler]!];

pkg/language_versioning_2.7_test/test/lib_ex2.8_test.dart renamed to pkg/language_versioning_2_7_test/test/lib_ex2.8_test.dart

@@ -559,20 +559,37 @@ class BrowserTestCommand extends Command {
 }
 
 class AnalysisCommand extends ProcessCommand {
+  final List<String> commonAnalyzerCliArguments;
+
   AnalysisCommand(String executable, List<String> arguments,
-      Map<String, String> environmentOverrides, {int index = 0})
+      this.commonAnalyzerCliArguments, Map<String, String> environmentOverrides,
+      {int index = 0})
       : super('dart2analyzer', executable, arguments, environmentOverrides,
             null, index);
 
-  AnalysisCommand indexedCopy(int index) =>
-      AnalysisCommand(executable, arguments, environmentOverrides,
-          index: index);
+  AnalysisCommand indexedCopy(int index) => AnalysisCommand(
+      executable, arguments, commonAnalyzerCliArguments, environmentOverrides,
+      index: index);
 
   CommandOutput createOutput(int exitCode, bool timedOut, List<int> stdout,
           List<int> stderr, Duration time, bool compilationSkipped,
           [int? pid = 0]) =>
       AnalysisCommandOutput(
           this, exitCode, timedOut, stdout, stderr, time, compilationSkipped);
+
+  @override
+  List<String> get batchArguments => commonAnalyzerCliArguments;
+
+  @override
+  List<String> get nonBatchArguments => commonAnalyzerCliArguments;
+
+  @override
+  bool _equal(covariant ProcessCommand other) {
+    return other is AnalysisCommand &&
+        super._equal(other) &&
+        deepJsonCompare(
+            commonAnalyzerCliArguments, other.commonAnalyzerCliArguments);
+  }
 }
 
 class CompareAnalyzerCfeCommand extends ProcessCommand {