Skip to content

Commit 1e4c02f

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Remove V1 from AST.
Change-Id: Ia78b38159bdb8c85c50048a70ba579e5b937eda8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/422880 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 83c2f1c commit 1e4c02f

File tree

4 files changed

+33
-704
lines changed

4 files changed

+33
-704
lines changed

pkg/analyzer/api.txt

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ package:analyzer/dart/ast/ast.dart:
283283
arguments (getter: ArgumentList?)
284284
atSign (getter: Token)
285285
constructorName (getter: SimpleIdentifier?)
286-
element (getter: Element?, deprecated)
287286
element2 (getter: Element2?, experimental)
288287
elementAnnotation (getter: ElementAnnotation?)
289288
name (getter: Identifier)
@@ -309,7 +308,6 @@ package:analyzer/dart/ast/ast.dart:
309308
message (getter: Expression?)
310309
rightParenthesis (getter: Token)
311310
AssignedVariablePattern (class extends Object implements VariablePattern):
312-
element (getter: Element?, deprecated)
313311
element2 (getter: Element2?, experimental)
314312
AssignmentExpression (class extends Object implements NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
315313
leftHandSide (getter: Expression)
@@ -512,12 +510,10 @@ package:analyzer/dart/ast/ast.dart:
512510
visitYieldStatement (method: R? Function(YieldStatement))
513511
AugmentedExpression (class extends Object implements Expression):
514512
augmentedKeyword (getter: Token)
515-
element (getter: Element?, deprecated)
516513
fragment (getter: Fragment?, experimental)
517514
AugmentedInvocation (class extends Object implements Expression):
518515
arguments (getter: ArgumentList)
519516
augmentedKeyword (getter: Token)
520-
element (getter: ExecutableElement?, deprecated)
521517
fragment (getter: ExecutableFragment?, experimental)
522518
typeArguments (getter: TypeArgumentList?)
523519
AwaitExpression (class extends Object implements Expression):
@@ -564,7 +560,6 @@ package:analyzer/dart/ast/ast.dart:
564560
rightParenthesis (getter: Token?)
565561
stackTraceParameter (getter: CatchClauseParameter?)
566562
CatchClauseParameter (class extends AstNode):
567-
declaredElement (getter: LocalVariableElement?, deprecated)
568563
declaredElement2 (getter: LocalVariableElement2?, experimental)
569564
declaredFragment (getter: LocalVariableFragment?, experimental)
570565
name (getter: Token)
@@ -573,7 +568,6 @@ package:analyzer/dart/ast/ast.dart:
573568
augmentKeyword (getter: Token?, experimental)
574569
baseKeyword (getter: Token?)
575570
classKeyword (getter: Token)
576-
declaredElement (getter: ClassElement?, deprecated)
577571
declaredFragment (getter: ClassFragment?, experimental)
578572
extendsClause (getter: ExtendsClause?)
579573
finalKeyword (getter: Token?)
@@ -592,7 +586,6 @@ package:analyzer/dart/ast/ast.dart:
592586
ClassTypeAlias (class extends Object implements TypeAlias):
593587
abstractKeyword (getter: Token?)
594588
baseKeyword (getter: Token?)
595-
declaredElement (getter: ClassElement?, deprecated)
596589
declaredFragment (getter: ClassFragment?, experimental)
597590
equals (getter: Token)
598591
finalKeyword (getter: Token?)
@@ -620,7 +613,6 @@ package:analyzer/dart/ast/ast.dart:
620613
CompilationUnit (class extends Object implements AstNode):
621614
beginToken (getter: Token)
622615
declarations (getter: NodeList<CompilationUnitMember>)
623-
declaredElement (getter: CompilationUnitElement?, deprecated)
624616
declaredFragment (getter: LibraryFragment?, experimental)
625617
directives (getter: NodeList<Directive>)
626618
endToken (getter: Token)
@@ -632,10 +624,8 @@ package:analyzer/dart/ast/ast.dart:
632624
sortedDirectivesAndDeclarations (getter: List<AstNode>)
633625
CompilationUnitMember (class extends Object implements Declaration)
634626
CompoundAssignmentExpression (class extends Object implements Expression):
635-
readElement (getter: Element?, deprecated)
636627
readElement2 (getter: Element2?, experimental)
637628
readType (getter: DartType?)
638-
writeElement (getter: Element?, deprecated)
639629
writeElement2 (getter: Element2?, experimental)
640630
writeType (getter: DartType?)
641631
ConditionalExpression (class extends Object implements Expression):
@@ -660,7 +650,6 @@ package:analyzer/dart/ast/ast.dart:
660650
augmentKeyword (getter: Token?)
661651
body (getter: FunctionBody)
662652
constKeyword (getter: Token?)
663-
declaredElement (getter: ConstructorElement?, deprecated)
664653
declaredFragment (getter: ConstructorFragment?, experimental)
665654
externalKeyword (getter: Token?)
666655
factoryKeyword (getter: Token?)
@@ -686,7 +675,6 @@ package:analyzer/dart/ast/ast.dart:
686675
constructorName (getter: ConstructorName)
687676
ConstructorReferenceNode (class extends Object implements AstNode):
688677
element (getter: ConstructorElement2?, experimental)
689-
staticElement (getter: ConstructorElement?, deprecated)
690678
ConstructorSelector (class extends Object implements AstNode):
691679
name (getter: SimpleIdentifier)
692680
period (getter: Token)
@@ -700,10 +688,8 @@ package:analyzer/dart/ast/ast.dart:
700688
precedence (getter: PatternPrecedence)
701689
unParenthesized (getter: DartPattern)
702690
Declaration (class extends Object implements AnnotatedNode):
703-
declaredElement (getter: Element?, deprecated)
704691
declaredFragment (getter: Fragment?, experimental)
705692
DeclaredIdentifier (class extends Object implements Declaration):
706-
declaredElement (getter: LocalVariableElement?, deprecated)
707693
declaredElement2 (getter: LocalVariableElement2?, experimental)
708694
declaredFragment (getter: LocalVariableFragment?)
709695
isConst (getter: bool)
@@ -712,7 +698,6 @@ package:analyzer/dart/ast/ast.dart:
712698
name (getter: Token)
713699
type (getter: TypeAnnotation?)
714700
DeclaredVariablePattern (class extends Object implements VariablePattern, sealed (immediate subtypes: DeclaredVariablePatternImpl)):
715-
declaredElement (getter: BindPatternVariableElement?, deprecated)
716701
declaredElement2 (getter: BindPatternVariableElement2?, experimental)
717702
declaredFragment (getter: BindPatternVariableFragment?)
718703
keyword (getter: Token?)
@@ -721,8 +706,7 @@ package:analyzer/dart/ast/ast.dart:
721706
defaultValue (getter: Expression?)
722707
parameter (getter: NormalFormalParameter)
723708
separator (getter: Token?)
724-
Directive (class extends Object implements AnnotatedNode, sealed (immediate subtypes: DirectiveImpl, LibraryDirective, PartOfDirective, UriBasedDirective)):
725-
element (getter: Element?, deprecated)
709+
Directive (class extends Object implements AnnotatedNode, sealed (immediate subtypes: DirectiveImpl, LibraryDirective, PartOfDirective, UriBasedDirective))
726710
DoStatement (class extends Object implements Statement):
727711
body (getter: Statement)
728712
condition (getter: Expression)
@@ -753,15 +737,12 @@ package:analyzer/dart/ast/ast.dart:
753737
EnumConstantDeclaration (class extends Object implements Declaration):
754738
arguments (getter: EnumConstantArguments?)
755739
augmentKeyword (getter: Token?, experimental)
756-
constructorElement (getter: ConstructorElement?, deprecated)
757740
constructorElement2 (getter: ConstructorElement2?, experimental)
758-
declaredElement (getter: FieldElement?, deprecated)
759741
declaredFragment (getter: FieldFragment?, experimental)
760742
name (getter: Token)
761743
EnumDeclaration (class extends Object implements NamedCompilationUnitMember):
762744
augmentKeyword (getter: Token?, experimental)
763745
constants (getter: NodeList<EnumConstantDeclaration>)
764-
declaredElement (getter: EnumElement?, deprecated)
765746
declaredFragment (getter: EnumFragment?, experimental)
766747
enumKeyword (getter: Token)
767748
implementsClause (getter: ImplementsClause?)
@@ -772,15 +753,13 @@ package:analyzer/dart/ast/ast.dart:
772753
typeParameters (getter: TypeParameterList?)
773754
withClause (getter: WithClause?)
774755
ExportDirective (class extends Object implements NamespaceDirective):
775-
element (getter: LibraryExportElement?, deprecated)
776756
exportKeyword (getter: Token)
777757
libraryExport (getter: LibraryExport?, experimental)
778758
Expression (class extends Object implements CollectionElement):
779759
correspondingParameter (getter: FormalParameterElement?, experimental)
780760
inConstantContext (getter: bool)
781761
isAssignable (getter: bool)
782762
precedence (getter: Precedence)
783-
staticParameterElement (getter: ParameterElement?, deprecated)
784763
staticType (getter: DartType?)
785764
unParenthesized (getter: Expression)
786765
ExpressionFunctionBody (class extends Object implements FunctionBody):
@@ -797,7 +776,6 @@ package:analyzer/dart/ast/ast.dart:
797776
superclass (getter: NamedType)
798777
ExtensionDeclaration (class extends Object implements CompilationUnitMember):
799778
augmentKeyword (getter: Token?, experimental)
800-
declaredElement (getter: ExtensionElement?, deprecated)
801779
declaredFragment (getter: ExtensionFragment?, experimental)
802780
extensionKeyword (getter: Token)
803781
leftBracket (getter: Token)
@@ -812,7 +790,6 @@ package:analyzer/dart/ast/ast.dart:
812790
onKeyword (getter: Token)
813791
ExtensionOverride (class extends Object implements Expression):
814792
argumentList (getter: ArgumentList)
815-
element (getter: ExtensionElement, deprecated)
816793
element2 (getter: ExtensionElement2, experimental)
817794
extendedType (getter: DartType?)
818795
importPrefix (getter: ImportPrefixReference?)
@@ -823,7 +800,6 @@ package:analyzer/dart/ast/ast.dart:
823800
ExtensionTypeDeclaration (class extends Object implements NamedCompilationUnitMember, experimental):
824801
augmentKeyword (getter: Token?, experimental)
825802
constKeyword (getter: Token?)
826-
declaredElement (getter: ExtensionTypeElement?, deprecated)
827803
declaredFragment (getter: ExtensionTypeFragment?, experimental)
828804
extensionKeyword (getter: Token)
829805
implementsClause (getter: ImplementsClause?)
@@ -891,7 +867,6 @@ package:analyzer/dart/ast/ast.dart:
891867
rightParenthesis (getter: Token)
892868
FormalParameter (class extends Object implements AstNode, sealed (immediate subtypes: DefaultFormalParameter, FormalParameterImpl, NormalFormalParameter)):
893869
covariantKeyword (getter: Token?)
894-
declaredElement (getter: ParameterElement?, deprecated)
895870
declaredFragment (getter: FormalParameterFragment?, experimental)
896871
isConst (getter: bool)
897872
isExplicitlyTyped (getter: bool)
@@ -910,7 +885,6 @@ package:analyzer/dart/ast/ast.dart:
910885
FormalParameterList (class extends Object implements AstNode):
911886
leftDelimiter (getter: Token?)
912887
leftParenthesis (getter: Token)
913-
parameterElements (getter: List<ParameterElement?>, deprecated)
914888
parameterFragments (getter: List<FormalParameterFragment?>, experimental)
915889
parameters (getter: NodeList<FormalParameter>)
916890
rightDelimiter (getter: Token?)
@@ -921,11 +895,9 @@ package:analyzer/dart/ast/ast.dart:
921895
isSynchronous (getter: bool)
922896
keyword (getter: Token?)
923897
star (getter: Token?)
924-
isPotentiallyMutatedInScope (method: bool Function(VariableElement), deprecated)
925898
isPotentiallyMutatedInScope2 (method: bool Function(VariableElement2), experimental)
926899
FunctionDeclaration (class extends Object implements NamedCompilationUnitMember):
927900
augmentKeyword (getter: Token?, experimental)
928-
declaredElement (getter: ExecutableElement?, deprecated)
929901
declaredFragment (getter: ExecutableFragment?, experimental)
930902
externalKeyword (getter: Token?)
931903
functionExpression (getter: FunctionExpression)
@@ -937,20 +909,17 @@ package:analyzer/dart/ast/ast.dart:
937909
functionDeclaration (getter: FunctionDeclaration)
938910
FunctionExpression (class extends Object implements Expression):
939911
body (getter: FunctionBody)
940-
declaredElement (getter: ExecutableElement?, deprecated)
941912
declaredFragment (getter: ExecutableFragment?, experimental)
942913
parameters (getter: FormalParameterList?)
943914
typeParameters (getter: TypeParameterList?)
944915
FunctionExpressionInvocation (class extends Object implements NullShortableExpression, InvocationExpression):
945916
element (getter: ExecutableElement2?, experimental)
946917
function (getter: Expression)
947-
staticElement (getter: ExecutableElement?, deprecated)
948918
FunctionReference (class extends Object implements Expression, CommentReferableExpression):
949919
function (getter: Expression)
950920
typeArgumentTypes (getter: List<DartType>?)
951921
typeArguments (getter: TypeArgumentList?)
952922
FunctionTypeAlias (class extends Object implements TypeAlias):
953-
declaredElement (getter: TypeAliasElement?, deprecated)
954923
declaredFragment (getter: TypeAliasFragment?, experimental)
955924
parameters (getter: FormalParameterList)
956925
returnType (getter: TypeAnnotation?)
@@ -981,7 +950,6 @@ package:analyzer/dart/ast/ast.dart:
981950
isPrivateName (static method: bool Function(String))
982951
element (getter: Element2?, experimental)
983952
name (getter: String)
984-
staticElement (getter: Element?, deprecated)
985953
IfElement (class extends Object implements CollectionElement):
986954
caseClause (getter: CaseClause?)
987955
elseElement (getter: CollectionElement?)
@@ -1005,18 +973,15 @@ package:analyzer/dart/ast/ast.dart:
1005973
interfaces (getter: NodeList<NamedType>)
1006974
ImplicitCallReference (class extends Object implements MethodReferenceExpression):
1007975
expression (getter: Expression)
1008-
staticElement (getter: MethodElement, deprecated)
1009976
typeArgumentTypes (getter: List<DartType>)
1010977
typeArguments (getter: TypeArgumentList?)
1011978
ImportDirective (class extends Object implements NamespaceDirective):
1012979
asKeyword (getter: Token?)
1013980
deferredKeyword (getter: Token?)
1014-
element (getter: LibraryImportElement?, deprecated)
1015981
importKeyword (getter: Token)
1016982
libraryImport (getter: LibraryImport?, experimental)
1017983
prefix (getter: SimpleIdentifier?)
1018984
ImportPrefixReference (class extends Object implements AstNode):
1019-
element (getter: Element?, deprecated)
1020985
element2 (getter: Element2?, experimental)
1021986
name (getter: Token)
1022987
period (getter: Token)
@@ -1069,7 +1034,6 @@ package:analyzer/dart/ast/ast.dart:
10691034
labels (getter: NodeList<Label>)
10701035
statement (getter: Statement)
10711036
LibraryDirective (class extends Object implements Directive):
1072-
element (getter: LibraryElement?, deprecated)
10731037
element2 (getter: LibraryElement2?, experimental)
10741038
libraryKeyword (getter: Token)
10751039
name2 (getter: LibraryIdentifier?)
@@ -1116,7 +1080,6 @@ package:analyzer/dart/ast/ast.dart:
11161080
MethodDeclaration (class extends Object implements ClassMember):
11171081
augmentKeyword (getter: Token?)
11181082
body (getter: FunctionBody)
1119-
declaredElement (getter: ExecutableElement?, deprecated)
11201083
declaredFragment (getter: ExecutableFragment?, experimental)
11211084
externalKeyword (getter: Token?)
11221085
isAbstract (getter: bool)
@@ -1140,11 +1103,9 @@ package:analyzer/dart/ast/ast.dart:
11401103
target (getter: Expression?)
11411104
MethodReferenceExpression (class extends Object implements Expression):
11421105
element (getter: MethodElement2?, experimental)
1143-
staticElement (getter: MethodElement?, deprecated)
11441106
MixinDeclaration (class extends Object implements NamedCompilationUnitMember):
11451107
augmentKeyword (getter: Token?)
11461108
baseKeyword (getter: Token?)
1147-
declaredElement (getter: MixinElement?, deprecated)
11481109
declaredFragment (getter: MixinFragment?, experimental)
11491110
implementsClause (getter: ImplementsClause?)
11501111
leftBracket (getter: Token)
@@ -1159,12 +1120,10 @@ package:analyzer/dart/ast/ast.dart:
11591120
NamedCompilationUnitMember (class extends Object implements CompilationUnitMember):
11601121
name (getter: Token)
11611122
NamedExpression (class extends Object implements Expression):
1162-
element (getter: ParameterElement?, deprecated)
11631123
element2 (getter: FormalParameterElement?, experimental)
11641124
expression (getter: Expression)
11651125
name (getter: Label)
11661126
NamedType (class extends Object implements TypeAnnotation):
1167-
element (getter: Element?, deprecated)
11681127
element2 (getter: Element2?, experimental)
11691128
importPrefix (getter: ImportPrefixReference?)
11701129
isDeferred (getter: bool)
@@ -1223,7 +1182,6 @@ package:analyzer/dart/ast/ast.dart:
12231182
rightParenthesis (getter: Token)
12241183
PartDirective (class extends Object implements UriBasedDirective):
12251184
configurations (getter: NodeList<Configuration>)
1226-
element (getter: PartElement?, deprecated)
12271185
partInclude (getter: PartInclude?, experimental)
12281186
partKeyword (getter: Token)
12291187
semicolon (getter: Token)
@@ -1239,7 +1197,6 @@ package:analyzer/dart/ast/ast.dart:
12391197
pattern (getter: DartPattern)
12401198
PatternField (class extends Object implements AstNode):
12411199
effectiveName (getter: String?)
1242-
element (getter: Element?, deprecated)
12431200
element2 (getter: Element2?, experimental)
12441201
name (getter: PatternFieldName?)
12451202
pattern (getter: DartPattern)
@@ -1258,12 +1215,10 @@ package:analyzer/dart/ast/ast.dart:
12581215
element (getter: MethodElement2?)
12591216
operand (getter: Expression)
12601217
operator (getter: Token)
1261-
staticElement (getter: MethodElement?, deprecated)
12621218
PrefixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
12631219
element (getter: MethodElement2?)
12641220
operand (getter: Expression)
12651221
operator (getter: Token)
1266-
staticElement (getter: MethodElement?, deprecated)
12671222
PrefixedIdentifier (class extends Object implements Identifier):
12681223
identifier (getter: SimpleIdentifier)
12691224
isDeferred (getter: bool)
@@ -1308,18 +1263,15 @@ package:analyzer/dart/ast/ast.dart:
13081263
period (getter: Token?)
13091264
thisKeyword (getter: Token)
13101265
RelationalPattern (class extends Object implements DartPattern):
1311-
element (getter: MethodElement?, deprecated)
13121266
element2 (getter: MethodElement2?, experimental)
13131267
operand (getter: Expression)
13141268
operator (getter: Token)
13151269
RepresentationConstructorName (class extends Object implements AstNode, experimental):
13161270
name (getter: Token)
13171271
period (getter: Token)
13181272
RepresentationDeclaration (class extends Object implements AstNode, experimental):
1319-
constructorElement (getter: ConstructorElement?, deprecated)
13201273
constructorFragment (getter: ConstructorFragment?, experimental)
13211274
constructorName (getter: RepresentationConstructorName?)
1322-
fieldElement (getter: FieldElement?, deprecated)
13231275
fieldFragment (getter: FieldFragment?, experimental)
13241276
fieldMetadata (getter: NodeList<Annotation>)
13251277
fieldName (getter: Token)
@@ -1456,7 +1408,6 @@ package:analyzer/dart/ast/ast.dart:
14561408
type (getter: NamedType)
14571409
TypeParameter (class extends Object implements Declaration):
14581410
bound (getter: TypeAnnotation?)
1459-
declaredElement (getter: TypeParameterElement?, deprecated)
14601411
declaredFragment (getter: TypeParameterFragment?, experimental)
14611412
extendsKeyword (getter: Token?)
14621413
name (getter: Token)
@@ -1471,7 +1422,6 @@ package:analyzer/dart/ast/ast.dart:
14711422
UriBasedDirective (class extends Object implements Directive, sealed (immediate subtypes: NamespaceDirective, PartDirective, UriBasedDirectiveImpl)):
14721423
uri (getter: StringLiteral)
14731424
VariableDeclaration (class extends Object implements Declaration):
1474-
declaredElement (getter: VariableElement?, deprecated)
14751425
declaredElement2 (getter: LocalVariableElement2?, experimental)
14761426
declaredFragment (getter: VariableFragment?, experimental)
14771427
equals (getter: Token?)

0 commit comments

Comments
 (0)