Reorder constructors in ‘Effective Dart: Usage’ and ’Constructors’ examples

examples/misc/lib/effective_dart/usage_bad.dart

@@ -272,14 +272,14 @@ void miscDeclAnalyzedButNotTested() {
 
 // #docregion this-dot-constructor
 class ShadeOfGray {
-  final int brightness;
-
   ShadeOfGray(int val) : brightness = val;
 
   ShadeOfGray.black() : this(0);
 
   // This won't parse or compile!
   // ShadeOfGray.alsoBlack() : black();
+
+  final int brightness;
 }
 // #enddocregion this-dot-constructor
 
@@ -330,10 +330,10 @@ Item? bestDeal(List<Item> cart) {
 
 // #docregion shadow-nullable-field
 class UploadException {
-  final Response? response;
-
   UploadException([this.response]);
 
+  final Response? response;
+
   @override
   String toString() {
     if (response != null) {
@@ -350,21 +350,25 @@ class UploadException {
 
 // #docregion calc-vs-store1
 class Circle1 {
-  double radius;
-  double area;
-  double circumference;
-
   Circle1(double radius)
       : radius = radius,
         area = pi * radius * radius,
         circumference = pi * 2.0 * radius;
+
+  double radius;
+  double area;
+  double circumference;
 }
 // #enddocregion calc-vs-store1
 
 //----------------------------------------------------------------------------
 
 // #docregion calc-vs-store2
 class Circle2 {
+  Circle2(this._radius) {
+    _recalculate();
+  }
+
   double _radius;
   double get radius => _radius;
   set radius(double value) {
@@ -378,10 +382,6 @@ class Circle2 {
   double _circumference = 0.0;
   double get circumference => _circumference;
 
-  Circle2(this._radius) {
-    _recalculate();
-  }
-
   void _recalculate() {
     _area = pi * _radius * _radius;
     _circumference = pi * 2.0 * _radius;
@@ -430,36 +430,38 @@ class Box2 {
 
 // #docregion field-init-at-decl
 class ProfileMark {
-  final String name;
-  final DateTime start;
-
   ProfileMark(this.name) : start = DateTime.now();
   ProfileMark.unnamed()
       : name = '',
         start = DateTime.now();
+
+  final String name;
+  final DateTime start;
 }
 // #enddocregion field-init-at-decl
 
 //----------------------------------------------------------------------------
 
 // #docregion field-init-as-param
 class Point0 {
-  double x, y;
   Point0(double x, double y)
       : x = x,
         y = y;
+
+  double x, y;
 }
 // #enddocregion field-init-as-param
 
 //----------------------------------------------------------------------------
 
 // #docregion late-init-list
 class Point1 {
-  late double x, y;
   Point1.polar(double theta, double radius) {
     x = cos(theta) * radius;
     y = sin(theta) * radius;
   }
+
+  late double x, y;
 }
 // #enddocregion late-init-list
 

examples/misc/lib/effective_dart/usage_good.dart

@@ -359,10 +359,10 @@ class Response {
 
 // #docregion shadow-nullable-field
 class UploadException {
-  final Response? response;
-
   UploadException([this.response]);
 
+  final Response? response;
+
   @override
   String toString() {
     final response = this.response;
@@ -380,10 +380,10 @@ class UploadException {
 
 // #docregion calc-vs-store
 class Circle {
-  double radius;
-
   Circle(this.radius);
 
+  double radius;
+
   double get area => pi * radius * radius;
   double get circumference => pi * 2.0 * radius;
 }
@@ -466,14 +466,14 @@ class Box2 {
 
 // #docregion this-dot-constructor
 class ShadeOfGray {
-  final int brightness;
-
   ShadeOfGray(int val) : brightness = val;
 
   ShadeOfGray.black() : this(0);
 
   // But now it will!
   ShadeOfGray.alsoBlack() : this.black();
+
+  final int brightness;
 }
 // #enddocregion this-dot-constructor
 
@@ -485,11 +485,11 @@ class BaseBox {
 
 // #docregion param-dont-shadow-field-ctr-init
 class Box3 extends BaseBox {
-  Object? value;
-
   Box3(Object? value)
       : value = value,
         super(value);
+
+  Object? value;
 }
 // #enddocregion param-dont-shadow-field-ctr-init
 
@@ -499,40 +499,42 @@ class Document {}
 
 // #docregion field-init-at-decl
 class ProfileMark {
-  final String name;
-  final DateTime start = DateTime.now();
-
   ProfileMark(this.name);
   ProfileMark.unnamed() : name = '';
+
+  final String name;
+  final DateTime start = DateTime.now();
 }
 // #enddocregion field-init-at-decl
 
 //----------------------------------------------------------------------------
 
 // #docregion field-init-as-param
 class Point0 {
-  double x, y;
   Point0(this.x, this.y);
+
+  double x, y;
 }
 // #enddocregion field-init-as-param
 
 //----------------------------------------------------------------------------
 
 // #docregion late-init-list
 class Point1 {
-  double x, y;
   Point1.polar(double theta, double radius)
       : x = cos(theta) * radius,
         y = sin(theta) * radius;
+
+  double x, y;
 }
 // #enddocregion late-init-list
 
 //----------------------------------------------------------------------------
 
 // #docregion semicolon-for-empty-body
 class Point2 {
-  double x, y;
   Point2(this.x, this.y);
+  double x, y;
 }
 // #enddocregion semicolon-for-empty-body
 

examples/misc/lib/language_tour/classes/employee.dart

@@ -4,11 +4,11 @@ Map fetchDefaultData() => {}; // stub
 
 // #docregion super
 class Person {
-  String? firstName;
-
   Person.fromJson(Map data) {
     print('in Person');
   }
+
+  String? firstName;
 }
 
 // #docregion method-then-constructor

examples/misc/lib/language_tour/classes/immutable_point.dart

@@ -1,7 +1,7 @@
 class ImmutablePoint {
+  const ImmutablePoint(this.x, this.y);
+
   static const ImmutablePoint origin = ImmutablePoint(0, 0);
 
   final double x, y;
-
-  const ImmutablePoint(this.x, this.y);
 }

examples/misc/lib/language_tour/classes/logger.dart

@@ -1,12 +1,5 @@
 // #docregion
 class Logger {
-  final String name;
-  bool mute = false;
-
-  // _cache is library-private, thanks to
-  // the _ in front of its name.
-  static final Map<String, Logger> _cache = <String, Logger>{};
-
   factory Logger(String name) {
     return _cache.putIfAbsent(name, () => Logger._internal(name));
   }
@@ -17,6 +10,13 @@ class Logger {
 
   Logger._internal(this.name);
 
+  final String name;
+  bool mute = false;
+
+  // _cache is library-private, thanks to
+  // the _ in front of its name.
+  static final Map<String, Logger> _cache = <String, Logger>{};
+
   void log(String msg) {
     if (!mute) print(msg);
   }

examples/misc/lib/language_tour/classes/point.dart

@@ -8,9 +8,6 @@ const double yOrigin = 0;
 
 // #docregion class-with-distanceTo, constructor-initializer
 class Point {
-  final double x;
-  final double y;
-
   // #docregion class-with-distanceTo, named-constructor
   Point(this.x, this.y);
   // #enddocregion class-with-distanceTo, named-constructor
@@ -39,4 +36,7 @@ class Point {
     return sqrt(dx * dx + dy * dy);
   }
   // #docregion constructor-initializer, named-constructor
+
+  final double x;
+  final double y;
 }

examples/misc/lib/language_tour/classes/point_alt.dart

@@ -6,9 +6,6 @@
 ///
 // #docregion idiomatic-constructor
 class Point {
-  double x = 0;
-  double y = 0;
-
   // Generative constructor with initializing formal parameters:
   Point(this.x, this.y);
   // #enddocregion idiomatic-constructor
@@ -32,4 +29,7 @@ class Point {
   // #enddocregion initializer-list-with-assert
 
 // #docregion idiomatic-constructor
+
+  double x = 0;
+  double y = 0;
 }

examples/misc/lib/language_tour/classes/point_redirecting.dart

@@ -1,9 +1,9 @@
 class Point {
-  double x, y;
-
   // The main constructor for this class.
   Point(this.x, this.y);
 
   // Delegates to the main constructor.
   Point.alongXAxis(double x) : this(x, 0);
+
+  double x, y;
 }

examples/misc/lib/language_tour/classes/point_with_distance_field.dart

@@ -2,14 +2,14 @@
 import 'dart:math';
 
 class Point {
-  final double x;
-  final double y;
-  final double distanceFromOrigin;
-
   Point(double x, double y)
       : x = x,
         y = y,
         distanceFromOrigin = sqrt(x * x + y * y);
+
+  final double x;
+  final double y;
+  final double distanceFromOrigin;
 }
 
 void main() {

examples/misc/lib/language_tour/classes/super_initializer_parameters.dart

@@ -1,29 +1,26 @@
 // #docregion positional, named
 class Vector2d {
-  // #enddocregion positional
-  // ...
-
-  // #enddocregion named
   // #docregion positional
-  final double x;
-  final double y;
-
   Vector2d(this.x, this.y);
   // #enddocregion positional
 
   // #docregion named
   Vector2d.named({required this.x, required this.y});
-// #docregion positional
-}
+  // #enddocregion named
 
-class Vector3d extends Vector2d {
+  // #docregion positional, named
   // #enddocregion positional
   // ...
 
   // #enddocregion named
   // #docregion positional
-  final double z;
+  final double x;
+  final double y;
+// #docregion positional
+}
 
+class Vector3d extends Vector2d {
+  // #docregion positional
   // Forward the x and y parameters to the default super constructor like:
   // Vector3d(final double x, final double y, this.z) : super(x, y);
   Vector3d(super.x, super.y, this.z);
@@ -34,6 +31,14 @@ class Vector3d extends Vector2d {
   // Vector3d.yzPlane({required double y, required this.z})
   //       : super.named(x: 0, y: y);
   Vector3d.yzPlane({required super.y, required this.z}) : super.named(x: 0);
+  // #enddocregion named
+
+  // #enddocregion positional
+  // ...
+
+  // #enddocregion named
+  // #docregion positional
+  final double z;
 // #docregion positional
 }
 // #enddocregion positional, named