33import 'dart:async' ;
44import 'dart:collection' ;
55
6- import 'package:analyzer/dart/element/element2 .dart' ;
6+ import 'package:analyzer/dart/element/element .dart' ;
77import 'package:analyzer/dart/element/nullability_suffix.dart' ;
88import 'package:analyzer/dart/element/type.dart' ;
99import 'package:build/build.dart' show BuildStep, log;
@@ -26,13 +26,13 @@ class CliGenerator extends GeneratorForAnnotation<CliOptions> {
2626
2727 @override
2828 Stream <String > generateForAnnotatedElement (
29- Element2 element,
29+ Element element,
3030 ConstantReader annotation,
3131 BuildStep buildStep,
3232 ) async * {
3333 await validateSdkConstraint (buildStep);
3434
35- if (element is ! ClassElement2 ) {
35+ if (element is ! ClassElement ) {
3636 final friendlyName = element.displayName;
3737 throw InvalidGenerationSourceError (
3838 'Generator cannot target `$friendlyName `. '
@@ -47,16 +47,16 @@ class CliGenerator extends GeneratorForAnnotation<CliOptions> {
4747 final fieldsList = createSortedFieldSet (element);
4848
4949 // Explicitly using `LinkedHashMap` – we want these ordered.
50- final fields = LinkedHashMap <String , FieldElement2 >.fromIterable (
50+ final fields = LinkedHashMap <String , FieldElement >.fromIterable (
5151 fieldsList,
52- key: (f) => (f as FieldElement2 ).name3 ! ,
52+ key: (f) => (f as FieldElement ).name ! ,
5353 );
5454
5555 // Get the constructor to use for the factory
5656
57- final populateParserName = '_\$ populate${element .name3 }Parser' ;
58- final parserFieldName = '_\$ parserFor${element .name3 }' ;
59- final resultParserName = '_\$ parse${element .name3 }Result' ;
57+ final populateParserName = '_\$ populate${element .name }Parser' ;
58+ final parserFieldName = '_\$ parserFor${element .name }' ;
59+ final resultParserName = '_\$ parse${element .name }Result' ;
6060
6161 if (fieldsList.any ((fe) => fe.type.isEnum)) {
6262 yield enumValueHelper;
@@ -85,7 +85,7 @@ T _$badNumberFormat<T extends num>(
8585
8686 var buffer = StringBuffer ()
8787 ..write ('''
88- ${element .name3 } $resultParserName (ArgResults result) =>''' );
88+ ${element .name } $resultParserName (ArgResults result) =>''' );
8989
9090 String deserializeForField (
9191 String fieldName, {
@@ -96,7 +96,7 @@ ${element.name3} $resultParserName(ArgResults result) =>''');
9696 buffer,
9797 element,
9898 fields.keys,
99- fields.values.where ((fe) => ! fe.isFinal).map ((fe) => fe.name3 ! ),
99+ fields.values.where ((fe) => ! fe.isFinal).map ((fe) => fe.name ! ),
100100 {},
101101 deserializeForField,
102102 );
@@ -166,7 +166,7 @@ ${element.name3} $resultParserName(ArgResults result) =>''');
166166 yield 'final $parserFieldName = $populateParserName (ArgParser());' ;
167167
168168 yield '''
169- ${element .name3 } parse${element .name3 }(List<String> args) {
169+ ${element .name } parse${element .name }(List<String> args) {
170170 final result = $parserFieldName .parse(args);
171171 return $resultParserName (result);
172172}
@@ -175,8 +175,8 @@ ${element.name3} parse${element.name3}(List<String> args) {
175175 final createCommand = annotation.read ('createCommand' ).boolValue;
176176 if (createCommand) {
177177 yield '''
178- abstract class _\$ ${element .name3 }Command<T> extends Command<T> {
179- _\$ ${element .name3 }Command() {
178+ abstract class _\$ ${element .name }Command<T> extends Command<T> {
179+ _\$ ${element .name }Command() {
180180 $populateParserName (argParser);
181181 }
182182
@@ -196,9 +196,9 @@ final _numCheckers = <TypeChecker, String>{
196196};
197197
198198String _deserializeForField (
199- FieldElement2 field,
199+ FieldElement field,
200200 FormalParameterElement ? ctorParam,
201- Map <String , FieldElement2 > allFields,
201+ Map <String , FieldElement > allFields,
202202) {
203203 final info = ArgInfo .fromField (field);
204204
@@ -207,7 +207,7 @@ String _deserializeForField(
207207 }
208208
209209 if (info.argType == ArgType .wasParsed) {
210- final name = field.name3 ! ;
210+ final name = field.name ! ;
211211 assert (name.endsWith (wasParsedSuffix));
212212 final targetFieldName = name.substring (
213213 0 ,
@@ -301,13 +301,13 @@ String _deserializeForField(
301301 throwUnsupported (field, 'The type `$targetType ` is not supported.' );
302302}
303303
304- String _getArgName (FieldElement2 element) =>
305- ArgInfo .fromField (element).optionData? .name ?? element.name3 ! .kebab;
304+ String _getArgName (FieldElement element) =>
305+ ArgInfo .fromField (element).optionData? .name ?? element.name ! .kebab;
306306
307- String _getArgNameStringLiteral (FieldElement2 element) =>
307+ String _getArgNameStringLiteral (FieldElement element) =>
308308 escapeDartString (_getArgName (element));
309309
310- void _parserOptionFor (StringBuffer buffer, FieldElement2 element) {
310+ void _parserOptionFor (StringBuffer buffer, FieldElement element) {
311311 final info = ArgInfo .fromField (element);
312312
313313 switch (info.argType) {
@@ -345,10 +345,10 @@ void _parserOptionFor(StringBuffer buffer, FieldElement2 element) {
345345 if (info.dartType.isEnum) {
346346 defaultsToValues.add (
347347 '${enumConstMapName (element .type )}'
348- '[${_overrideParamName (element .name3 !)}]' ,
348+ '[${_overrideParamName (element .name !)}]' ,
349349 );
350350 } else {
351- defaultsToValues.add (_overrideParamName (element.name3 ! ));
351+ defaultsToValues.add (_overrideParamName (element.name ! ));
352352 }
353353 }
354354
0 commit comments