1414 * limitations under the License.
1515 */
1616
17- import 'package:analyzer/dart/element/element2 .dart' ;
17+ import 'package:analyzer/dart/element/element .dart' ;
1818import 'package:analyzer/dart/element/nullability_suffix.dart' ;
1919import 'package:analyzer/dart/element/type.dart' ;
2020import 'package:build/build.dart' ;
@@ -39,12 +39,12 @@ late TypeChecker setBuilderChecker;
3939late TypeChecker builtValueFieldChecker;
4040late TypeChecker builtValueEnumChecker;
4141
42- late InterfaceElement2 builtInterface;
43- late InterfaceElement2 builtBuilderInterface;
42+ late InterfaceElement builtInterface;
43+ late InterfaceElement builtBuilderInterface;
4444
45- late InterfaceElement2 listBuilderInterface;
46- late InterfaceElement2 mapBuilderInterface;
47- late InterfaceElement2 setBuilderInterface;
45+ late InterfaceElement listBuilderInterface;
46+ late InterfaceElement mapBuilderInterface;
47+ late InterfaceElement setBuilderInterface;
4848
4949bool hasBuiltInterop = false ;
5050
@@ -62,11 +62,11 @@ Future tryInitializeBuiltInterop(BuildStep step) async {
6262 _builtValueLibrary = LibraryReader (builtValueLibrary);
6363 _builtCollectionLibrary = LibraryReader (builtCollectionLibrary);
6464
65- builtInterface = _builtValueLibrary.findType ("Built" ) as InterfaceElement2 ;
66- builtBuilderInterface = _builtValueLibrary.findType ("Builder" ) as InterfaceElement2 ;
67- listBuilderInterface = _builtCollectionLibrary.findType ("ListBuilder" ) as InterfaceElement2 ;
68- mapBuilderInterface = _builtCollectionLibrary.findType ("MapBuilder" ) as InterfaceElement2 ;
69- setBuilderInterface = _builtCollectionLibrary.findType ("SetBuilder" ) as InterfaceElement2 ;
65+ builtInterface = _builtValueLibrary.findType ("Built" ) as InterfaceElement ;
66+ builtBuilderInterface = _builtValueLibrary.findType ("Builder" ) as InterfaceElement ;
67+ listBuilderInterface = _builtCollectionLibrary.findType ("ListBuilder" ) as InterfaceElement ;
68+ mapBuilderInterface = _builtCollectionLibrary.findType ("MapBuilder" ) as InterfaceElement ;
69+ setBuilderInterface = _builtCollectionLibrary.findType ("SetBuilder" ) as InterfaceElement ;
7070
7171 builtChecker = TypeChecker .fromStatic (builtInterface.thisType);
7272 builtBuilderChecker = TypeChecker .fromStatic (builtBuilderInterface.thisType);
@@ -82,17 +82,17 @@ Future tryInitializeBuiltInterop(BuildStep step) async {
8282}
8383
8484Future <IRStructure > structurizeBuilt (
85- SubjectCodeContext codeContext, SubjectGenContext context, ClassElement2 element) async {
85+ SubjectCodeContext codeContext, SubjectGenContext context, ClassElement element) async {
8686 var counter = codeContext.cachedCounter;
87- var builtInterfaceImpl = element.thisType.asInstanceOf2 (builtInterface)! ;
88- var builderElement = builtInterfaceImpl.typeArguments[1 ].element3 ! as ClassElement2 ;
87+ var builtInterfaceImpl = element.thisType.asInstanceOf (builtInterface)! ;
88+ var builderElement = builtInterfaceImpl.typeArguments[1 ].element ! as ClassElement ;
8989
9090 var getters =
91- builderElement.getters2 .where ((element) => element.isPublic && ! element.isStatic).toList ();
91+ builderElement.getters .where ((element) => element.isPublic && ! element.isStatic).toList ();
9292
9393 var fields = < IRStructureField > [];
9494 for (var builderGetter in getters) {
95- var fieldGetter = element.getGetter2 (builderGetter.displayName)! ;
95+ var fieldGetter = element.getGetter (builderGetter.displayName)! ;
9696 var fieldName = fieldGetter.displayName;
9797 var fieldType = fieldGetter.returnType;
9898 var serialType = await getSerialType (fieldType, context);
@@ -101,7 +101,7 @@ Future<IRStructure> structurizeBuilt(
101101 var optional = fieldType.nullabilitySuffix == NullabilitySuffix .question;
102102 if (fieldType is DynamicType ) optional = true ;
103103
104- var builtValueFieldAnnotation = fieldGetter.metadata2 .annotations
104+ var builtValueFieldAnnotation = fieldGetter.metadata .annotations
105105 .whereTypeChecker (builtValueFieldChecker)
106106 .firstOrNull
107107 ? .computeConstantValue ();
@@ -137,14 +137,14 @@ Future<IRStructure> structurizeBuilt(
137137}
138138
139139Future <void > writeBuiltInteropConverter (
140- ClassElement2 element, SubjectCodeContext codeContext, SubjectGenContext context) async {
140+ ClassElement element, SubjectCodeContext codeContext, SubjectGenContext context) async {
141141 codeContext.additionalImports.add (AliasImport .gen ("package:dogs_core/dogs_core.dart" ));
142142 codeContext.additionalImports.add (AliasImport .gen ("package:dogs_built/dogs_built.dart" ));
143143 codeContext.additionalImports
144144 .add (AliasImport .gen ("package:built_collection/built_collection.dart" ));
145145
146- var builtInterfaceImpl = element.thisType.asInstanceOf2 (builtInterface)! ;
147- var builderElement = builtInterfaceImpl.typeArguments[1 ].element3 ! as ClassElement2 ;
146+ var builtInterfaceImpl = element.thisType.asInstanceOf (builtInterface)! ;
147+ var builderElement = builtInterfaceImpl.typeArguments[1 ].element ! as ClassElement ;
148148
149149 var structure = await structurizeBuilt (codeContext, context, element);
150150 var typeRef = codeContext.typeName (element.thisType);
@@ -188,15 +188,15 @@ Future<void> writeBuiltInteropConverter(
188188 ..static = true
189189 ..lambda = false
190190 ..body = Code (
191- "return (${typeRef }Builder()\n ${builderElement .getters2 .where ((element ) => element .isPublic && !element .isStatic ).mapIndexed ((i , e ) {
191+ "return (${typeRef }Builder()\n ${builderElement .getters .where ((element ) => element .isPublic && !element .isStatic ).mapIndexed ((i , e ) {
192192 if (listBuilderChecker .isAssignableFromType (e .returnType )) {
193- var innerType = e .returnType .asInstanceOf2 (listBuilderInterface )!.typeArguments [0 ];
193+ var innerType = e .returnType .asInstanceOf (listBuilderInterface )!.typeArguments [0 ];
194194 return "..${e .displayName } = list[$i ] == null ? null : gen.ListBuilder<${codeContext .typeName (innerType )}>(list[$i ])" ;
195195 } else if (setBuilderChecker .isAssignableFromType (e .returnType )) {
196- var innerType = e .returnType .asInstanceOf2 (setBuilderInterface )!.typeArguments [0 ];
196+ var innerType = e .returnType .asInstanceOf (setBuilderInterface )!.typeArguments [0 ];
197197 return "..${e .displayName } = list[$i ] == null ? null : gen.SetBuilder<${codeContext .typeName (innerType )}>(list[$i ])" ;
198198 } else if (mapBuilderChecker .isAssignableFromType (e .returnType )) {
199- var typeArguments = e .returnType .asInstanceOf2 (mapBuilderInterface )!.typeArguments ;
199+ var typeArguments = e .returnType .asInstanceOf (mapBuilderInterface )!.typeArguments ;
200200 return "..${e .displayName } = list[$i ] == null ? null : gen.MapBuilder<${codeContext .typeName (typeArguments [0 ])}, ${codeContext .typeName (typeArguments [1 ])}>(list[$i ])" ;
201201 }
202202 return "..${e .displayName } = list[$i ]" ;
0 commit comments