Version 3.6.0-145.0.dev

Merge c008c15 into dev

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ### Language
 
+Dart 3.6 adds [digit separators] to the language. To use them, set your
+package's [SDK constraint][language version] lower bound to 3.6 or greater
+(`sdk: '^3.6.0'`).
+
+#### Digit separators
+
+[digit separators]: https://github.com/dart-lang/language/issues/2
+
+Digits in number literals (decimal integer literals, double literals,
+scientific notation literals, and hexadecimal literals) can now include
+underscores between digits, as "digit separators." The separators do not change
+the value of a literal, but can serve to make the number more readable.
+
+```dart
+100__000_000__000_000__000_000  // one hundred million million millions!
+0x4000_0000_0000_0000
+0.000_000_000_01
+0x00_14_22_01_23_45  // MAC address
+```
+
+Separators are not allowed at the start of a number (this would be parsed as an
+identifier), at the end of a number, or adjacent to another character in a
+number, like `.`, `x`, or the `e` in scientific notation.
+
 - **Breaking Change** [#56065][]: The context used by the compiler and analyzer
   to perform type inference on the operand of a `throw` expression has been
   changed from the "unknown type" to `Object`. This makes the type system more

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

@@ -54,10 +54,10 @@ enum ExperimentalFlag {
 
   digitSeparators(
       name: 'digit-separators',
-      isEnabledByDefault: false,
+      isEnabledByDefault: true,
       isExpired: false,
-      experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion),
+      experimentEnabledVersion: const Version(3, 6),
+      experimentReleasedVersion: const Version(3, 6)),
 
   enhancedEnums(
       name: 'enhanced-enums',

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

@@ -227,7 +227,7 @@ class ExperimentalFeatures {
     isExpired: IsExpired.digit_separators,
     documentation: 'Number literals with digit separators.',
     experimentalReleaseVersion: null,
-    releaseVersion: null,
+    releaseVersion: Version.parse('3.6.0'),
   );
 
   static final enhanced_enums = ExperimentalFeature(
@@ -518,7 +518,7 @@ class IsEnabledByDefault {
   static const bool control_flow_collections = true;
 
   /// Default state of the experiment "digit-separators"
-  static const bool digit_separators = false;
+  static const bool digit_separators = true;
 
   /// Default state of the experiment "enhanced-enums"
   static const bool enhanced_enums = true;

pkg/analyzer/test/src/dart/analysis/analysis_context_collection_test.dart

@@ -333,6 +333,7 @@ analysisOptions
       constant-update-2018
       constructor-tearoffs
       control-flow-collections
+      digit-separators
       enhanced-enums
       extension-methods
       generic-metadata

pkg/analyzer_utilities/lib/test/experiments/experiments.dart

@@ -16,7 +16,6 @@ import 'package:analyzer/dart/analysis/features.dart';
 /// whether a given flag is already included.
 List<String> experimentsForTests = [
   Feature.augmentations.enableString,
-  Feature.digit_separators.enableString,
   Feature.enhanced_parts.enableString,
   Feature.macros.enableString,
   Feature.null_aware_elements.enableString,

pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

@@ -109,11 +109,11 @@ class ExperimentalFlag {
 
   static const ExperimentalFlag digitSeparators = const ExperimentalFlag(
       name: 'digit-separators',
-      isEnabledByDefault: false,
+      isEnabledByDefault: true,
       isExpired: false,
-      enabledVersion: defaultLanguageVersion,
-      experimentEnabledVersion: defaultLanguageVersion,
-      experimentReleasedVersion: defaultLanguageVersion);
+      enabledVersion: const Version(3, 6),
+      experimentEnabledVersion: const Version(3, 6),
+      experimentReleasedVersion: const Version(3, 6));
 
   static const ExperimentalFlag enhancedEnums = const ExperimentalFlag(
       name: 'enhanced-enums',

runtime/vm/experimental_features.cc

@@ -16,7 +16,7 @@ namespace dart {
 
 bool GetExperimentalFeatureDefault(ExperimentalFeature feature) {
   constexpr bool kFeatureValues[] = {
-      true, true, true, true, true, true, true, true, true, true, true,
+      true, true, true, true, true, true, true, true, true, true, true, true,
       true, true, true, true, true, true, true, true, true, true, true,
   };
   ASSERT(static_cast<size_t>(feature) < ARRAY_SIZE(kFeatureValues));
@@ -25,6 +25,7 @@ bool GetExperimentalFeatureDefault(ExperimentalFeature feature) {
 
 const char* GetExperimentalFeatureName(ExperimentalFeature feature) {
   constexpr const char* kFeatureNames[] = {
+      "digit-separators",
       "inference-update-3",
       "inline-class",
       "inference-update-2",

runtime/vm/experimental_features.h

@@ -12,6 +12,7 @@
 namespace dart {
 
 enum class ExperimentalFeature {
+  digit_separators,
   inference_update_3,
   inline_class,
   inference_update_2,

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 6
 PATCH 0
-PRERELEASE 144
+PRERELEASE 145
 PRERELEASE_PATCH 0

tools/experimental_features.yaml

@@ -131,9 +131,6 @@ features:
   wildcard-variables:
     help: "Local declarations and parameters named `_` are non-binding."
 
-  digit-separators:
-    help: "Number literals with digit separators."
-
   null-aware-elements:
     help: "Null-aware elements and map entries in collections."
 
@@ -156,6 +153,17 @@ features:
 # Shipped flags should be marked retired the following stable release.
 #
 
+  digit-separators:
+    enabledIn: '3.6.0'
+    validation: |
+      main() {
+        int x = 1_000_000;
+        int y = 0xff_ff_ff;
+        double z = 1__2.3__4e5__6;
+        print('feature enabled');
+      }
+    help: "Number literals with digit separators."
+
   inference-update-3: # See https://github.com/dart-lang/language/issues/1618
     enabledIn: '3.4.0'
     validation: |