@@ -32,8 +32,6 @@ import 'package:analyzer/src/dart/element/inheritance_manager3.dart'
32
32
import 'package:analyzer/src/dart/element/member.dart' show ExecutableMember;
33
33
// ignore: implementation_imports
34
34
import 'package:analyzer/src/dart/element/type_algebra.dart' show Substitution;
35
- // ignore: implementation_imports
36
- import 'package:analyzer/src/utilities/extensions/element.dart' ;
37
35
import 'package:build/build.dart' ;
38
36
// Do not expose [refer] in the default namespace.
39
37
//
@@ -90,21 +88,21 @@ class MockBuilder implements Builder {
90
88
91
89
final inheritanceManager = InheritanceManager3 ();
92
90
final mockTargetGatherer = _MockTargetGatherer (
93
- entryLib.asElement2 ,
91
+ entryLib,
94
92
inheritanceManager,
95
93
);
96
94
97
95
final assetUris = await _resolveAssetUris (
98
96
buildStep.resolver,
99
97
mockTargetGatherer._mockTargets,
100
98
mockLibraryAsset.path,
101
- entryLib.asElement2 ,
99
+ entryLib,
102
100
);
103
101
104
102
final mockLibraryInfo = _MockLibraryInfo (
105
103
mockTargetGatherer._mockTargets,
106
104
assetUris: assetUris,
107
- entryLib: entryLib.asElement2 ,
105
+ entryLib: entryLib,
108
106
inheritanceManager: inheritanceManager,
109
107
);
110
108
@@ -162,7 +160,7 @@ class MockBuilder implements Builder {
162
160
languageVersion: entryLib.languageVersion.effective,
163
161
).format ('''
164
162
// Mocks generated by Mockito $packageVersion from annotations
165
- // in ${entryLib .asElement2 . firstFragment .source .uri .path }.
163
+ // in ${entryLib .firstFragment .source .uri .path }.
166
164
// Do not manually edit this file.
167
165
168
166
@@ -243,11 +241,7 @@ $rawOutput
243
241
final exportingLibrary = _findExportOf (librariesWithTypes, element);
244
242
245
243
try {
246
- final typeAssetId = await resolver.assetIdForElement (
247
- // Use element1 until `assetIdForElement` accepts element2.
248
- // ignore: deprecated_member_use
249
- exportingLibrary.asElement,
250
- );
244
+ final typeAssetId = await resolver.assetIdForElement (exportingLibrary);
251
245
252
246
if (typeAssetId.path.startsWith ('lib/' )) {
253
247
typeUris[element] = typeAssetId.uri.toString ();
@@ -1259,7 +1253,9 @@ class _MockClassInfo {
1259
1253
typeAlias? .element2.aliasedType as analyzer.InterfaceType ? ;
1260
1254
final typeToMock = aliasedType ?? mockTarget.classType;
1261
1255
final classToMock = mockTarget.interfaceElement;
1262
- final classIsImmutable = classToMock.metadata.any ((it) => it.isImmutable);
1256
+ final classIsImmutable = classToMock.metadata2.annotations.any (
1257
+ (it) => it.isImmutable,
1258
+ );
1263
1259
final className = aliasedElement? .name3 ?? classToMock.name3;
1264
1260
1265
1261
return Class ((cBuilder) {
0 commit comments