Skip to content

Commit 62d6042

Browse files
scheglovCommit Queue
scheglov
authored and
Commit Queue
committed
Elements. Write FieldElement and FieldFragment metadata.
No implementation changes, just updating test expectations with more data. Change-Id: I0c5f34f5b1cab546c4690fe957da739b85334e9c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/461145 Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
1 parent 48d4f71 commit 62d6042

File tree

5 files changed

+446
-2
lines changed

5 files changed

+446
-2
lines changed

‎pkg/analyzer/test/src/summary/element_text.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ class _Element2Writer extends _AbstractElementWriter {
576576
_sink.writelnWithIndent('hasEnclosingTypeParameterReference: true');
577577
}
578578
// _writeDocumentation(e.documentationComment);
579-
// _writeMetadata(e.metadata);
579+
_writeMetadata(e.metadata);
580580
_writeSinceSdkVersion(e);
581581
// _writeCodeRange(e);
582582
_writeTypeInferenceError(e.typeInferenceError);
@@ -638,7 +638,7 @@ class _Element2Writer extends _AbstractElementWriter {
638638
_sink.withIndent(() {
639639
_writeElementReference('element', f.element);
640640
// _writeDocumentation(f.documentationComment);
641-
// _writeMetadata(f.metadata);
641+
_writeMetadata(f.metadata);
642642
// _writeSinceSdkVersion(f.sinceSdkVersion);
643643
// _writeCodeRange(f);
644644
// _writeType('type', f.type);

‎pkg/analyzer/test/src/summary/elements/enum_test.dart‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4552,6 +4552,14 @@ library
45524552
fields
45534553
#F2 hasInitializer a (nameOffset:46) (firstTokenOffset:11) (offset:46)
45544554
element: <testLibrary>::@enum::E::@field::a
4555+
metadata
4556+
Annotation
4557+
atSign: @ @32
4558+
name: SimpleIdentifier
4559+
token: annotation @33
4560+
element: <testLibrary>::@getter::annotation
4561+
staticType: null
4562+
element: <testLibrary>::@getter::annotation
45554563
initializer: expression_0
45564564
InstanceCreationExpression
45574565
constructorName: ConstructorName
@@ -4566,6 +4574,14 @@ library
45664574
staticType: E
45674575
#F3 hasInitializer b (nameOffset:75) (firstTokenOffset:51) (offset:75)
45684576
element: <testLibrary>::@enum::E::@field::b
4577+
metadata
4578+
Annotation
4579+
atSign: @ @61
4580+
name: SimpleIdentifier
4581+
token: annotation @62
4582+
element: <testLibrary>::@getter::annotation
4583+
staticType: null
4584+
element: <testLibrary>::@getter::annotation
45694585
initializer: expression_1
45704586
InstanceCreationExpression
45714587
constructorName: ConstructorName
@@ -4624,6 +4640,14 @@ library
46244640
static const enumConstant hasImplicitType hasInitializer a
46254641
reference: <testLibrary>::@enum::E::@field::a
46264642
firstFragment: #F2
4643+
metadata
4644+
Annotation
4645+
atSign: @ @32
4646+
name: SimpleIdentifier
4647+
token: annotation @33
4648+
element: <testLibrary>::@getter::annotation
4649+
staticType: null
4650+
element: <testLibrary>::@getter::annotation
46274651
type: E
46284652
constantInitializer
46294653
fragment: #F2
@@ -4632,6 +4656,14 @@ library
46324656
static const enumConstant hasImplicitType hasInitializer b
46334657
reference: <testLibrary>::@enum::E::@field::b
46344658
firstFragment: #F3
4659+
metadata
4660+
Annotation
4661+
atSign: @ @61
4662+
name: SimpleIdentifier
4663+
token: annotation @62
4664+
element: <testLibrary>::@getter::annotation
4665+
staticType: null
4666+
element: <testLibrary>::@getter::annotation
46354667
type: E
46364668
constantInitializer
46374669
fragment: #F3
@@ -5377,6 +5409,14 @@ library
53775409
fields
53785410
#F2 hasInitializer v (nameOffset:26) (firstTokenOffset:23) (offset:26)
53795411
element: <testLibrary>::@enum::E::@field::v
5412+
metadata
5413+
Annotation
5414+
atSign: @ @23
5415+
name: SimpleIdentifier
5416+
token: a @24
5417+
element: <testLibrary>::@getter::a
5418+
staticType: null
5419+
element: <testLibrary>::@getter::a
53805420
initializer: expression_0
53815421
InstanceCreationExpression
53825422
constructorName: ConstructorName
@@ -5429,6 +5469,14 @@ library
54295469
static const enumConstant hasImplicitType hasInitializer v
54305470
reference: <testLibrary>::@enum::E::@field::v
54315471
firstFragment: #F2
5472+
metadata
5473+
Annotation
5474+
atSign: @ @23
5475+
name: SimpleIdentifier
5476+
token: a @24
5477+
element: <testLibrary>::@getter::a
5478+
staticType: null
5479+
element: <testLibrary>::@getter::a
54325480
type: E
54335481
constantInitializer
54345482
fragment: #F2
@@ -5517,6 +5565,21 @@ library
55175565
fields
55185566
#F7 hasInitializer a (nameOffset:78) (firstTokenOffset:70) (offset:78)
55195567
element: <testLibrary>::@enum::E::@field::a
5568+
metadata
5569+
Annotation
5570+
atSign: @ @70
5571+
name: SimpleIdentifier
5572+
token: A @71
5573+
element: <testLibrary>::@class::A
5574+
staticType: null
5575+
arguments: ArgumentList
5576+
leftParenthesis: ( @72
5577+
arguments
5578+
IntegerLiteral
5579+
literal: 100 @73
5580+
staticType: int
5581+
rightParenthesis: ) @76
5582+
element: <testLibrary>::@class::A::@constructor::new
55205583
initializer: expression_0
55215584
InstanceCreationExpression
55225585
constructorName: ConstructorName
@@ -5545,6 +5608,21 @@ library
55455608
staticType: E
55465609
#F9 hasInitializer c (nameOffset:96) (firstTokenOffset:88) (offset:96)
55475610
element: <testLibrary>::@enum::E::@field::c
5611+
metadata
5612+
Annotation
5613+
atSign: @ @88
5614+
name: SimpleIdentifier
5615+
token: A @89
5616+
element: <testLibrary>::@class::A
5617+
staticType: null
5618+
arguments: ArgumentList
5619+
leftParenthesis: ( @90
5620+
arguments
5621+
IntegerLiteral
5622+
literal: 300 @91
5623+
staticType: int
5624+
rightParenthesis: ) @94
5625+
element: <testLibrary>::@class::A::@constructor::new
55485626
initializer: expression_2
55495627
InstanceCreationExpression
55505628
constructorName: ConstructorName
@@ -5624,6 +5702,21 @@ library
56245702
static const enumConstant hasImplicitType hasInitializer a
56255703
reference: <testLibrary>::@enum::E::@field::a
56265704
firstFragment: #F7
5705+
metadata
5706+
Annotation
5707+
atSign: @ @70
5708+
name: SimpleIdentifier
5709+
token: A @71
5710+
element: <testLibrary>::@class::A
5711+
staticType: null
5712+
arguments: ArgumentList
5713+
leftParenthesis: ( @72
5714+
arguments
5715+
IntegerLiteral
5716+
literal: 100 @73
5717+
staticType: int
5718+
rightParenthesis: ) @76
5719+
element: <testLibrary>::@class::A::@constructor::new
56275720
type: E
56285721
constantInitializer
56295722
fragment: #F7
@@ -5640,6 +5733,21 @@ library
56405733
static const enumConstant hasImplicitType hasInitializer c
56415734
reference: <testLibrary>::@enum::E::@field::c
56425735
firstFragment: #F9
5736+
metadata
5737+
Annotation
5738+
atSign: @ @88
5739+
name: SimpleIdentifier
5740+
token: A @89
5741+
element: <testLibrary>::@class::A
5742+
staticType: null
5743+
arguments: ArgumentList
5744+
leftParenthesis: ( @90
5745+
arguments
5746+
IntegerLiteral
5747+
literal: 300 @91
5748+
staticType: int
5749+
rightParenthesis: ) @94
5750+
element: <testLibrary>::@class::A::@constructor::new
56435751
type: E
56445752
constantInitializer
56455753
fragment: #F9
@@ -5700,6 +5808,14 @@ library
57005808
fields
57015809
#F2 hasInitializer v (nameOffset:16) (firstTokenOffset:11) (offset:16)
57025810
element: <testLibrary>::@enum::E::@field::v
5811+
metadata
5812+
Annotation
5813+
atSign: @ @11
5814+
name: SimpleIdentifier
5815+
token: v @12
5816+
element: <testLibrary>::@enum::E::@getter::v
5817+
staticType: null
5818+
element: <testLibrary>::@enum::E::@getter::v
57035819
initializer: expression_0
57045820
InstanceCreationExpression
57055821
constructorName: ConstructorName
@@ -5742,6 +5858,14 @@ library
57425858
static const enumConstant hasImplicitType hasInitializer v
57435859
reference: <testLibrary>::@enum::E::@field::v
57445860
firstFragment: #F2
5861+
metadata
5862+
Annotation
5863+
atSign: @ @11
5864+
name: SimpleIdentifier
5865+
token: v @12
5866+
element: <testLibrary>::@enum::E::@getter::v
5867+
staticType: null
5868+
element: <testLibrary>::@enum::E::@getter::v
57455869
type: E
57465870
constantInitializer
57475871
fragment: #F2

‎pkg/analyzer/test/src/summary/elements/extension_type_test.dart‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,14 @@ library
820820
fields
821821
#F2 it (nameOffset:43) (firstTokenOffset:34) (offset:43)
822822
element: <testLibrary>::@extensionType::A::@field::it
823+
metadata
824+
Annotation
825+
atSign: @ @34
826+
name: SimpleIdentifier
827+
token: foo @35
828+
element: package:test/a.dart::@getter::foo
829+
staticType: null
830+
element: package:test/a.dart::@getter::foo
823831
constructors
824832
#F3 new (nameOffset:<null>) (firstTokenOffset:32) (offset:32)
825833
element: <testLibrary>::@extensionType::A::@constructor::new
@@ -842,6 +850,14 @@ library
842850
final it
843851
reference: <testLibrary>::@extensionType::A::@field::it
844852
firstFragment: #F2
853+
metadata
854+
Annotation
855+
atSign: @ @34
856+
name: SimpleIdentifier
857+
token: foo @35
858+
element: package:test/a.dart::@getter::foo
859+
staticType: null
860+
element: package:test/a.dart::@getter::foo
845861
type: int
846862
getter: <testLibrary>::@extensionType::A::@getter::it
847863
declaringFormalParameter: <testLibrary>::@extensionType::A::@constructor::new::@formalParameter::it

0 commit comments

Comments
 (0)