Merge branch 'main' of https://github.com/dart-lang/language

Author: munificent

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       )
 
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       - name: Install latex tools
         run: |
           sudo apt-get update -qq

.github/workflows/dart.yml

@@ -13,7 +13,7 @@ jobs:
   analyze:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
             sdk: main
@@ -34,7 +34,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
         with:
             sdk: main

accepted/2.15/constructor-tearoffs/feature-specification.md

@@ -61,7 +61,7 @@ _The syntax without type arguments is currently allowed by the language grammar,
 
 A named constructor tear-off expression of one of the forms above evaluates to a function value which could be created by tearing off a *corresponding constructor function*, which would be a static function defined on the class denoted by *C*, with a fresh name here represented by adding `$tearoff`:
 
-> <code>static *C* *name*$tearoff\<*typeParams*>(*params*) => *C*\<*typeArgs*>.*name*(*args*);</code>
+> <code>static *C*\<*typeArgs*> *name*$tearoff\<*typeParams*>(*params*) => *C*\<*typeArgs*>.*name*(*args*);</code>
 
 If *C* is not generic, then <code>\<*typeParams*\></code> and <code>\<*typeArgs*\></code> are omitted. Otherwise <code>\<*typeParams*\></code> are exactly the same type parameters as those of the class declaration of *C* (including bounds), and <code>\<*typeArgs*></code> applies those type parameter variables directly as type arguments to *C*.
 

accepted/2.3/unified-collections/feature-specification.md

@@ -1,5 +1,15 @@
 # Unified Collections
 
+## Status
+
+**This document serves to document the background and history of the unified
+collections feature. The source of truth on this topic at this time is the
+'Collection Literals' section of the [language specification][]
+([PDF][language specification PDF]).**
+
+[language specification]: https://github.com/dart-lang/language/blob/master/specification/dartLangSpec.tex
+[language specification PDF]: https://spec.dart.dev/DartLangSpecDraft.pdf
+
 The Dart team is concurrently working on three proposals that affect collection
 literals:
 
@@ -16,10 +26,10 @@ To make things easier on implementers and anyone else trying to understand the
 entire set of changes, this specification unifies and subsumes all three of
 those proposals.
 
-**This document is now the source of truth for these language changes.** The
+**This document is a further development of the documents about spread collections
+and control flow collections, and it supersedes those documents.** The
 other three proposals are useful because they contain motivation and other
 context, but the precise syntax and semantics may be out of date in those docs.
-This is where you should be looking if you're an implementer.
 
 ## Grammar
 

accepted/future-releases/extension-types/feature-specification.md

@@ -432,7 +432,7 @@ A compile-time error occurs if the extension type declaration declares any
 instance variables, unless they are `external`.
 
 *An external instance variable is just a convenient notation for an external
-getter and (if not `final`) an external setter. They are allowed.*
+getter and (if not `final`) an external setter, which are both allowed.*
 
 The _name of the representation_ in an extension type declaration with a
 representation declaration of the form `(T id)` is the identifier `id`, and

working/1426-extension-types/feature-specification-inline-classes.md

@@ -2,8 +2,13 @@
 
 Author: [email protected]
 
-Status: Accepted.
+Status: Obsolete
 
+**This proposal is now obsolete. The mechanism has been renamed to
+_extension types_. Please see the [extension types specification][] for the
+accepted specification proposal.**
+
+[extension types specification]: https://github.com/dart-lang/language/blob/main/accepted/future-releases/extension-types/feature-specification.md
 
 ## Change Log
 

working/1426-extension-types/feature-specification-views.md

@@ -4,11 +4,11 @@ Author: [email protected]
 
 Status: Obsolete
 
-**This proposal is now obsolete. The mechanism has been renamed to _inline
-classes_. Please see the [inline classes specification][2] for the most recent proposed
-specification.**
+**This proposal is now obsolete. The mechanism has been renamed to
+_extension types_. Please see the [extension types specification][] for the
+accepted specification proposal.**
 
-[2]: https://github.com/dart-lang/language/blob/master/accepted/future-releases/inline-classes/feature-specification.md
+[extension types specification]: https://github.com/dart-lang/language/blob/main/accepted/future-releases/extension-types/feature-specification.md
 
 
 ## Change Log

working/1426-extension-types/feature-specification.md

@@ -2,7 +2,13 @@
 
 Author: [email protected]
 
-Status: Draft
+Status: Obsolete
+
+**This proposal is now obsolete. The mechanism has been renamed multiple times, and the
+current name is again _extension types_. Please see the new 
+[extension types specification][] for the accepted specification proposal.**
+
+[extension types specification]: https://github.com/dart-lang/language/blob/main/accepted/future-releases/extension-types/feature-specification.md
 
 
 ## Change Log

working/2364 - primary constructors/feature-specification.md

@@ -41,7 +41,6 @@ with two fields and a constructor:
 
 ```dart
 // Current syntax.
-
 class Point {
   int x;
   int y;
@@ -54,7 +53,6 @@ concisely:
 
 ```dart
 // A declaration with the same meaning, using a primary constructor.
-
 class Point(int x, int y);
 ```
 
@@ -66,12 +64,14 @@ library, so we should read the examples as "you can write this _or_ you can
 write that". So the example above would be shown as follows:
 
 ```dart
+// Current syntax.
 class Point {
   int x;
   int y;
   Point(this.x, this.y);
 }
 
+// Using a primary constructor.
 class Point(int x, int y);
 ```
 
@@ -114,12 +114,14 @@ initializing formal anyway, so they will just need to be declared using a
 normal `external` variable declaration.
 
 ```dart
+// Current syntax.
 class ModifierClass {
   late int x;
   external double d;
   ModifierClass(this.x);
 }
 
+// Using a primary constructor.
 class ModifierClass(this.x) {
   late int x;
   external double d;
@@ -132,6 +134,7 @@ class ModifierClass(this.x) {
 Super parameters can be declared in the same way as in a body constructor:
 
 ```dart
+// Current syntax.
 class A {
   final int a;
   A(this.a);
@@ -141,19 +144,22 @@ class B extends A {
   B(super.a);
 }
 
+// Using a primary constructor.
 class A(final int a);
 class B(super.a) extends A;
 ```
 
 Next, the constructor can be named, and it can be constant:
 
 ```dart
+// Current syntax.
 class Point {
   final int x;
   final int y;
   const Point._(this.x, this.y);
 }
 
+// Using a primary constructor.
 class const Point._(final int x, final int y);
 ```
 
@@ -182,16 +188,14 @@ declaration is an `extension type` or an `enum` declaration, the modifier
 from the formal parameter in the primary constructor:
 
 ```dart
-extension type I.name(int x); // Must use a primary constructor.
+// Current syntax.
 
 class Point {
   final int x;
   final int y;
   const Point(this.x, this.y);
 }
 
-class const Point(int x, int y);
-
 enum E {
   one('a'),
   two('b');
@@ -200,7 +204,14 @@ enum E {
   const E(this.s);
 }
 
+// Using a primary constructor.
+
+class const Point(int x, int y);
+
 enum E(String s) { one('a'), two('b') }
+
+extension type I.name(int x); // Must use a primary constructor.
+
 ```
 
 This mechanism follows an existing pattern, where `const` modifiers can be
@@ -218,78 +229,63 @@ Optional parameters can be declared as usual in a primary constructor, with
 default values that must be constant as usual:
 
 ```dart
+// Current syntax.
 class Point {
   int x;
   int y;
   Point(this.x, [this.y = 0]);
 }
 
+// Using a primary constructor.
 class Point(int x, [int y = 0]);
 ```
 
 Similarly for named parameters, required or not:
 
 ```dart
+// Current syntax.
 class Point {
   int x;
   int y;
   Point(this.x, {required this.y});
 }
 
+// Using a primary constructor.
 class Point(int x, {required int y});
 ```
 
 In this declaration it is possible to omit the modifier `required` on the
 named parameter `y`, because it is implied by the fact that the type of `y`
 is non-nullable (potentially non-nullable is enough).
 
-The current scope for the default values in the primary constructor is the
-enclosing library scope. This means that a naive copy/paste operation on
-the source code could change the meaning of the default value. In that case
-a new way to denote the given value is established. For example, consider
-this class using a primary constructor:
-
-```dart
-static const d = 42;
-
-class Point(int x, [int y = d]) {
-  void d() {}
-}
-```
-
-This corresponds to the following class without a primary constructor:
-
-```dart
-static const d = 42;
-static const _freshName = d; // Eliminate the name clash.
-
-class Point {
-  int x;
-  int y;
-  Point(this.x, [this.y = _freshName]);
-  void d() {}
-}
-```
-
 The class header can have additional elements, just like class headers
 where there is no primary constructor:
 
 ```dart
+// Current syntax.
 class D<TypeVariable extends Bound> extends A with M implements B, C {
   final int x;
   final int y;
   const D.named(this.x, [this.y = 0]);
 }
 
+// Using a primary constructor.
 class const D<TypeVariable extends Bound>.named(int x, [int y = 0])
     extends A with M implements B, C;
 ```
 
 In the case where the header gets unwieldy it is possible to declare the
-primary constructor in the body of the class, which is also equivalent to
-the previous examples:
+primary constructor in the body of the class using the `primary` keyword:
 
 ```dart
+// Current syntax.
+class D<TypeVariable extends Bound> extends A with M implements B, C {
+  final int x;
+  final int y;
+  const D.named(this.x, [this.y = 0]);
+}
+
+// Using a primary constructor.
 class D<TypeVariable extends Bound> extends A with M implements B, C {
   primary const D.named(int x, [int y = 0]);
 }
@@ -303,6 +299,7 @@ same way as a primary constructor in the header of the declaration. For
 example:
 
 ```dart
+// Current syntax.
 class A {
   A(String _);
 }
@@ -337,6 +334,7 @@ class E extends A {
   }
 }
 
+// Using a primary constructor.
 class E extends A {
   external int y;
   int z;