Use Dart 3.7.0, reformat.

Author: davidmorgan

.github/workflows/dart.yml

@@ -40,23 +40,23 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_format; linux; Dart 3.6.0; PKG: source_gen; `dart analyze`"
+    name: "analyze_format; linux; Dart 3.7.0; PKG: source_gen; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen;commands:analyze_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "3.6.0"
+          sdk: "3.7.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -177,23 +177,23 @@ jobs:
       - job_002
       - job_003
   job_005:
-    name: "unit_test; linux; Dart 3.6.0; PKG: source_gen; `dart test`"
+    name: "unit_test; linux; Dart 3.7.0; PKG: source_gen; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0;packages:source_gen
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.6.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0;packages:source_gen
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.7.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "3.6.0"
+          sdk: "3.7.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -279,13 +279,13 @@ jobs:
       - job_002
       - job_003
   job_008:
-    name: "unit_test; windows; Dart 3.6.0; PKG: source_gen; `dart test`"
+    name: "unit_test; windows; Dart 3.7.0; PKG: source_gen; `dart test`"
     runs-on: windows-latest
     steps:
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
         with:
-          sdk: "3.6.0"
+          sdk: "3.7.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

analysis_options.yaml

@@ -29,7 +29,6 @@ linter:
     - prefer_const_declarations
     - prefer_expression_function_bodies
     - prefer_final_locals
-    - require_trailing_commas
     - sort_child_properties_last
     - unnecessary_await_in_return
     - use_full_hex_values_for_flutter_colors

source_gen/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1-wip
+
+- Require Dart 3.7.0
+
 ## 2.0.0
 
 - **Breaking Change**: Change `formatOutput` function to accept a language

source_gen/lib/builder.dart

@@ -33,8 +33,10 @@ Builder combiningBuilder([BuilderOptions options = BuilderOptions.empty]) {
     optionsMap.remove('ignore_for_file') as List? ?? <String>[],
   );
   final preamble = optionsMap.remove('preamble') as String? ?? '';
-  final buildExtensions =
-      validatedBuildExtensionsFrom(optionsMap, _defaultExtensions);
+  final buildExtensions = validatedBuildExtensionsFrom(
+    optionsMap,
+    _defaultExtensions,
+  );
 
   final builder = CombiningBuilder(
     includePartName: includePartName,
@@ -75,18 +77,19 @@ class CombiningBuilder implements Builder {
     Set<String>? ignoreForFile,
     String? preamble,
     this.buildExtensions = _defaultExtensions,
-  })  : _includePartName = includePartName ?? false,
-        _ignoreForFile = ignoreForFile ?? const <String>{},
-        _preamble = preamble ?? '';
+  }) : _includePartName = includePartName ?? false,
+       _ignoreForFile = ignoreForFile ?? const <String>{},
+       _preamble = preamble ?? '';
 
   @override
   Future<void> build(BuildStep buildStep) async {
     // Pattern used for `findAssets`, which must be glob-compatible
     final assetPath = buildStep.inputId.path;
     final pattern = '${p.withoutExtension(Glob.quote(assetPath))}.*$_partFiles';
 
-    final inputBaseName =
-        p.basenameWithoutExtension(buildStep.inputId.pathSegments.last);
+    final inputBaseName = p.basenameWithoutExtension(
+      buildStep.inputId.pathSegments.last,
+    );
 
     // Pattern used to ensure items are only considered if they match
     // [file name without extension].[valid part id].[part file extension]
@@ -101,11 +104,12 @@ class CombiningBuilder implements Builder {
       ].join(),
     );
 
-    final assetIds = await buildStep
-        .findAssets(Glob(pattern))
-        .where((id) => restrictedPattern.hasMatch(id.pathSegments.last))
-        .toList()
-      ..sort();
+    final assetIds =
+        await buildStep
+              .findAssets(Glob(pattern))
+              .where((id) => restrictedPattern.hasMatch(id.pathSegments.last))
+              .toList()
+          ..sort();
 
     final assets = await Stream.fromIterable(assetIds)
         .asyncMap((id) async {
@@ -124,8 +128,9 @@ class CombiningBuilder implements Builder {
     final partOfUri = uriOfPartial(inputLibrary, buildStep.inputId, outputId);
 
     // Ensure that the input has a correct `part` statement.
-    final libraryUnit =
-        await buildStep.resolver.compilationUnitFor(buildStep.inputId);
+    final libraryUnit = await buildStep.resolver.compilationUnitFor(
+      buildStep.inputId,
+    );
     final part = computePartUrl(buildStep.inputId, outputId);
     if (!hasExpectedPartDirective(libraryUnit, part)) {
       log.warning(
@@ -135,9 +140,10 @@ class CombiningBuilder implements Builder {
       return;
     }
 
-    final ignoreForFile = _ignoreForFile.isEmpty
-        ? ''
-        : '\n// ignore_for_file: ${_ignoreForFile.join(', ')}\n';
+    final ignoreForFile =
+        _ignoreForFile.isEmpty
+            ? ''
+            : '\n// ignore_for_file: ${_ignoreForFile.join(', ')}\n';
 
     final preamble = _preamble.isEmpty ? '' : '\n$_preamble\n';
 

source_gen/lib/src/builder.dart

@@ -57,16 +57,15 @@ class _Builder extends Builder {
     bool? writeDescriptions,
     this.allowSyntaxErrors = false,
     BuilderOptions? options,
-  })  : _generatedExtension = generatedExtension,
-        buildExtensions = validatedBuildExtensionsFrom(
-            options != null ? Map.of(options.config) : null, {
-          '.dart': [
-            generatedExtension,
-            ...additionalOutputExtensions,
-          ],
-        }),
-        _writeDescriptions = writeDescriptions ?? true,
-        _header = (header ?? defaultFileHeader).trim() {
+  }) : _generatedExtension = generatedExtension,
+       buildExtensions = validatedBuildExtensionsFrom(
+         options != null ? Map.of(options.config) : null,
+         {
+           '.dart': [generatedExtension, ...additionalOutputExtensions],
+         },
+       ),
+       _writeDescriptions = writeDescriptions ?? true,
+       _header = (header ?? defaultFileHeader).trim() {
     if (_generatedExtension.isEmpty || !_generatedExtension.startsWith('.')) {
       throw ArgumentError.value(
         _generatedExtension,
@@ -102,8 +101,10 @@ class _Builder extends Builder {
       return;
     }
 
-    final lib = await buildStep.resolver
-        .libraryFor(buildStep.inputId, allowSyntaxErrors: allowSyntaxErrors);
+    final lib = await buildStep.resolver.libraryFor(
+      buildStep.inputId,
+      allowSyntaxErrors: allowSyntaxErrors,
+    );
     await _generateForLibrary(lib, buildStep);
   }
 
@@ -138,10 +139,13 @@ class _Builder extends Builder {
           ..writeln('part of \'$partOfUri\';');
         final part = computePartUrl(buildStep.inputId, outputId);
 
-        final libraryUnit =
-            await buildStep.resolver.compilationUnitFor(buildStep.inputId);
-        final hasLibraryPartDirectiveWithOutputUri =
-            hasExpectedPartDirective(libraryUnit, part);
+        final libraryUnit = await buildStep.resolver.compilationUnitFor(
+          buildStep.inputId,
+        );
+        final hasLibraryPartDirectiveWithOutputUri = hasExpectedPartDirective(
+          libraryUnit,
+          part,
+        );
         if (!hasLibraryPartDirectiveWithOutputUri) {
           // TODO: Upgrade to error in a future breaking change?
           log.warning(
@@ -163,8 +167,9 @@ class _Builder extends Builder {
           ..writeln()
           ..writeln(_headerLine)
           ..writeAll(
-            LineSplitter.split(item.generatorDescription)
-                .map((line) => '// $line\n'),
+            LineSplitter.split(
+              item.generatorDescription,
+            ).map((line) => '// $line\n'),
           )
           ..writeln(_headerLine)
           ..writeln();
@@ -176,8 +181,10 @@ class _Builder extends Builder {
     var genPartContent = contentBuffer.toString();
 
     try {
-      genPartContent =
-          formatOutput(genPartContent, library.languageVersion.effective);
+      genPartContent = formatOutput(
+        genPartContent,
+        library.languageVersion.effective,
+      );
     } catch (e, stack) {
       log.severe(
         '''
@@ -240,10 +247,7 @@ class SharedPartBuilder extends _Builder {
     super.additionalOutputExtensions,
     super.allowSyntaxErrors,
     super.writeDescriptions,
-  }) : super(
-          generatedExtension: '.$partId.g.part',
-          header: '',
-        ) {
+  }) : super(generatedExtension: '.$partId.g.part', header: '') {
     if (!_partIdRegExp.hasMatch(partId)) {
       throw ArgumentError.value(
         partId,
@@ -304,9 +308,7 @@ class PartBuilder extends _Builder {
     super.header,
     super.allowSyntaxErrors,
     super.options,
-  }) : super(
-          generatedExtension: generatedExtension,
-        );
+  }) : super(generatedExtension: generatedExtension);
 }
 
 /// A [Builder] which generates standalone Dart library files.

source_gen/lib/src/constants/revive.dart

@@ -35,10 +35,7 @@ Revivable reviveInstance(DartObject object, [LibraryElement? origin]) {
   origin ??= element!.library;
   var url = Uri.parse(urlOfElement(element!));
   if (element is FunctionElement) {
-    return Revivable._(
-      source: url.removeFragment(),
-      accessor: element.name,
-    );
+    return Revivable._(source: url.removeFragment(), accessor: element.name);
   }
   if (element is MethodElement && element.isStatic) {
     return Revivable._(
@@ -68,8 +65,9 @@ Revivable reviveInstance(DartObject object, [LibraryElement? origin]) {
   }
 
   for (final type in origin!.definingCompilationUnit.classes) {
-    for (final e in type.fields
-        .where((f) => f.isConst && f.computeConstantValue() == object)) {
+    for (final e in type.fields.where(
+      (f) => f.isConst && f.computeConstantValue() == object,
+    )) {
       final result = Revivable._(
         source: url.removeFragment(),
         accessor: '${type.name}.${e.name}',

source_gen/lib/src/generated_output.dart

@@ -9,10 +9,10 @@ class GeneratedOutput {
   final String generatorDescription;
 
   GeneratedOutput(Generator generator, this.output)
-      : assert(output.isNotEmpty),
-        // assuming length check is cheaper than simple string equality
-        assert(output.length == output.trim().length),
-        generatorDescription = _toString(generator);
+    : assert(output.isNotEmpty),
+      // assuming length check is cheaper than simple string equality
+      assert(output.length == output.trim().length),
+      generatorDescription = _toString(generator);
 
   static String _toString(Generator generator) {
     final output = generator.toString();

source_gen/lib/src/library.dart

@@ -35,12 +35,12 @@ class LibraryReader {
 
   /// All of the declarations in this library.
   Iterable<Element> get allElements => [
-        element,
-        ...element.topLevelElements,
-        ...element.definingCompilationUnit.libraryImports,
-        ...element.definingCompilationUnit.libraryExports,
-        ...element.definingCompilationUnit.parts,
-      ];
+    element,
+    ...element.topLevelElements,
+    ...element.definingCompilationUnit.libraryImports,
+    ...element.definingCompilationUnit.libraryExports,
+    ...element.definingCompilationUnit.parts,
+  ];
 
   /// All of the declarations in this library annotated with [checker].
   Iterable<AnnotatedElement> annotatedWith(
@@ -101,9 +101,10 @@ class LibraryReader {
   Uri pathToUrl(dynamic toUrlOrString) {
     // TODO: https://github.com/dart-lang/source_gen/issues/672 - Take Object
     ArgumentError.checkNotNull(toUrlOrString, 'toUrlOrString');
-    final to = toUrlOrString is Uri
-        ? toUrlOrString
-        : Uri.parse(toUrlOrString as String);
+    final to =
+        toUrlOrString is Uri
+            ? toUrlOrString
+            : Uri.parse(toUrlOrString as String);
     if (to.scheme == 'dart') {
       // Convert dart:core/map.dart to dart:core.
       return normalizeDartUrl(to);
@@ -131,15 +132,10 @@ class LibraryReader {
           return Uri(path: to.pathSegments.last);
         }
         final relative = p.toUri(
-          p.relative(
-            to.toString(),
-            from: from.toString(),
-          ),
+          p.relative(to.toString(), from: from.toString()),
         );
         // We now have a URL like "../b.dart", but we just want "b.dart".
-        return relative.replace(
-          pathSegments: relative.pathSegments.skip(1),
-        );
+        return relative.replace(pathSegments: relative.pathSegments.skip(1));
       }
       throw ArgumentError.value(to, 'to', 'Not relative to $from');
     }

source_gen/lib/src/output_helpers.dart

@@ -21,18 +21,21 @@ Stream<String> normalizeGeneratorOutput(Object? value) {
   }
 
   if (value is Stream) {
-    return value.where((e) => e != null).map((e) {
-      if (e is String) {
-        return e.trim();
-      }
+    return value
+        .where((e) => e != null)
+        .map((e) {
+          if (e is String) {
+            return e.trim();
+          }
 
-      throw _argError(e as Object);
-    }).where((e) => e.isNotEmpty);
+          throw _argError(e as Object);
+        })
+        .where((e) => e.isNotEmpty);
   }
   throw _argError(value);
 }
 
 ArgumentError _argError(Object value) => ArgumentError(
-      'Must be a String or be an Iterable/Stream containing String values. '
-      'Found `${Error.safeToString(value)}` (${value.runtimeType}).',
-    );
+  'Must be a String or be an Iterable/Stream containing String values. '
+  'Found `${Error.safeToString(value)}` (${value.runtimeType}).',
+);