Skip to content

Commit 7126af1

Browse files
scheglovCommit Queue
authored andcommitted
DeCo. Add PropertyAccessorElement.isOriginDeclaration, isOriginInterface, isOriginVariable.
Update element text writer, update expectations. Change-Id: Ic30aee9c8ea98b9cc5581b5a390935e921babbbe Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/465743 Reviewed-by: Paul Berry <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 342a0a7 commit 7126af1

25 files changed

+4906
-4876
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,11 @@ class _Element2Writer extends _AbstractElementWriter {
948948
_sink.writeIf(e.isAbstract, 'abstract ');
949949
_sink.writeIf(e.isExternal, 'external ');
950950
_sink.writeIf(e.isExtensionTypeMember, 'isExtensionTypeMember ');
951+
952+
_assertHasExactlyOneTrue([e.isOriginDeclaration, e.isOriginVariable]);
953+
_sink.writeIf(e.isOriginDeclaration, 'isOriginDeclaration ');
954+
_sink.writeIf(e.isOriginVariable, 'isOriginVariable ');
955+
951956
_writeElementName(e);
952957
});
953958

@@ -998,6 +1003,11 @@ class _Element2Writer extends _AbstractElementWriter {
9981003
_writeObjectId(f);
9991004
_sink.writeIf(f.isAugmentation, 'augment ');
10001005
_sink.writeIf(f.isSynthetic, 'synthetic ');
1006+
1007+
_assertHasExactlyOneTrue([f.isOriginDeclaration, f.isOriginVariable]);
1008+
_sink.writeIf(f.isOriginDeclaration, 'isOriginDeclaration ');
1009+
_sink.writeIf(f.isOriginVariable, 'isOriginVariable ');
1010+
10011011
_writeFragmentName(f);
10021012
// _writeBodyModifiers(e);
10031013
});
@@ -1544,6 +1554,16 @@ class _Element2Writer extends _AbstractElementWriter {
15441554
_sink.writeIf(e.isAbstract, 'abstract ');
15451555
_sink.writeIf(e.isExternal, 'external ');
15461556
_sink.writeIf(e.isExtensionTypeMember, 'isExtensionTypeMember ');
1557+
1558+
_assertHasExactlyOneTrue([
1559+
e.isOriginDeclaration,
1560+
e.isOriginInterface,
1561+
e.isOriginVariable,
1562+
]);
1563+
_sink.writeIf(e.isOriginDeclaration, 'isOriginDeclaration ');
1564+
_sink.writeIf(e.isOriginInterface, 'isOriginInterface ');
1565+
_sink.writeIf(e.isOriginVariable, 'isOriginVariable ');
1566+
15471567
_writeElementName(e);
15481568
});
15491569

@@ -1594,6 +1614,16 @@ class _Element2Writer extends _AbstractElementWriter {
15941614
_writeObjectId(f);
15951615
_sink.writeIf(f.isAugmentation, 'augment ');
15961616
_sink.writeIf(f.isSynthetic, 'synthetic ');
1617+
1618+
_assertHasExactlyOneTrue([
1619+
f.isOriginDeclaration,
1620+
f.isOriginInterface,
1621+
f.isOriginVariable,
1622+
]);
1623+
_sink.writeIf(f.isOriginDeclaration, 'isOriginDeclaration ');
1624+
_sink.writeIf(f.isOriginInterface, 'isOriginInterface ');
1625+
_sink.writeIf(f.isOriginVariable, 'isOriginVariable ');
1626+
15971627
_writeFragmentName(f);
15981628
// _writeBodyModifiers(f);
15991629
});

pkg/analyzer/test/src/summary/elements/class_test.dart

Lines changed: 614 additions & 614 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)