Import several commits from GitHub:

* d358e24
* 8e88b5b
* 85af696

PiperOrigin-RevId: 720248839

Author: srawlins

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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

lib/src/builder.dart

@@ -141,11 +141,9 @@ 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: DartFormatter.latestLanguageVersion)
+        DartFormatter(languageVersion: entryLib.languageVersion.effective)
             .format('''
 // Mocks generated by Mockito $packageVersion from annotations
 // in ${entryLib.definingCompilationUnit.source.uri.path}.
@@ -195,7 +193,7 @@ $rawOutput
           interface.typeArguments.forEach(addTypesFrom);
           interface.allSupertypes.forEach(addTypesFrom);
         case final analyzer.RecordType record:
-          record.positionalTypes.forEach(addTypesFrom);
+          record.positionalFields.map((e) => e.type).forEach(addTypesFrom);
           record.namedFields.map((e) => e.type).forEach(addTypesFrom);
       }
     }

lib/src/version.dart

@@ -1 +1 @@
-const packageVersion = '5.4.5';
+const packageVersion = '5.4.6';

pubspec.yaml

@@ -1,5 +1,5 @@
 name: mockito
-version: 5.4.5
+version: 5.4.6
 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.0
+  package_config: ^2.1.1
   test: ^1.24.4