Merge pull request #789 from dart-lang:latest_deps

PiperOrigin-RevId: 707624429

Author: copybara-github

CHANGELOG.md

@@ -1,8 +1,3 @@
-## 5.4.6
-
-* When formatting a generated mocks library, use the language version of the
-  library with the mockito annotation.
-
 ## 5.4.5
 
 * Ignore "must_be_immutable" warning in generated files. Mocks cannot be made
@@ -26,9 +21,9 @@
 
 ## 5.4.3
 
-* Require analyzer 5.12.0, allow analyzer version 6.x.
+* Require analyzer 5.12.0, allow analyzer version 6.x;
 * Add example of writing a class to mock function objects.
-* Add support for the `build_extensions` build.yaml option.
+* Add support for the `build_extensions` build.yaml option
 * Require Dart >=3.1.0.
 * **Potentially breaking** Changed default `String` value returned by nice
   mocks' unstubbed method to include some useful info. This could break the

lib/src/builder.dart

@@ -141,9 +141,11 @@ class MockBuilder implements Builder {
         orderDirectives: true,
         useNullSafetySyntax: sourceLibIsNonNullable);
     final rawOutput = mockLibrary.accept(emitter).toString();
-
+    // The source lib may be pre-null-safety because of an explicit opt-out
+    // (`// @dart=2.9`), as opposed to living in a pre-null-safety package. To
+    // allow for this situation, we must also add an opt-out comment here.
     final mockLibraryContent =
-        DartFormatter(languageVersion: entryLib.languageVersion.effective)
+        DartFormatter(languageVersion: DartFormatter.latestLanguageVersion)
             .format('''
 // Mocks generated by Mockito $packageVersion from annotations
 // in ${entryLib.definingCompilationUnit.source.uri.path}.
@@ -193,7 +195,7 @@ $rawOutput
           interface.typeArguments.forEach(addTypesFrom);
           interface.allSupertypes.forEach(addTypesFrom);
         case final analyzer.RecordType record:
-          record.positionalFields.map((e) => e.type).forEach(addTypesFrom);
+          record.positionalTypes.forEach(addTypesFrom);
           record.namedFields.map((e) => e.type).forEach(addTypesFrom);
       }
     }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: mockito
-version: 5.4.6
+version: 5.4.5
 description: >-
   A mock framework inspired by Mockito with APIs for Fakes, Mocks,
   behavior verification, and stubbing.
@@ -30,5 +30,5 @@ dev_dependencies:
   build_web_compilers: ^4.0.11
   http: ^1.0.0
   lints: ^5.1.0
-  package_config: ^2.1.1
+  package_config: ^2.1.0
   test: ^1.24.4