Skip to content

Commit d284a8d

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Migrate test/src/summary/elements/type_alias_test.dart
Write hasImplicitType flag for formal parmeters. Change-Id: I6434abdf376c3ef3dac163370853b06a2f366ace Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402885 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 29fe663 commit d284a8d

18 files changed

+704
-564
lines changed

pkg/analyzer/analyzer_use_new_elements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ test/src/summary/elements/enum_test.dart
194194
test/src/summary/elements/extension_type_test.dart
195195
test/src/summary/elements/metadata_test.dart
196196
test/src/summary/elements/top_level_variable_test.dart
197-
test/src/summary/elements/type_alias_test.dart
198197
test/src/summary/elements/type_inference_test.dart
199198
test/src/summary/elements_base.dart
200199
test/src/summary/macro_test.dart

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ class _Element2Writer extends _AbstractElementWriter {
635635
_sink.writeIf(e.isConst, 'const ');
636636
_sink.writeIf(e.isCovariant, 'covariant ');
637637
_sink.writeIf(e.isFinal, 'final ');
638+
_sink.writeIf(e.hasImplicitType, 'hasImplicitType ');
638639

639640
if (e is FieldFormalParameterElement) {
640641
_sink.write('this.');
@@ -2118,6 +2119,15 @@ class _ElementWriter extends _AbstractElementWriter {
21182119
});
21192120
}
21202121

2122+
void _assertEnclosingElement<E extends Element>(
2123+
Iterable<E> elements,
2124+
Element enclosingElement,
2125+
) {
2126+
for (var element in elements) {
2127+
expect(element.enclosingElement3, same(enclosingElement));
2128+
}
2129+
}
2130+
21212131
void _assertNonSyntheticElementSelf(Element element) {
21222132
expect(element.isSynthetic, isFalse);
21232133
expect(element.nonSynthetic, same(element));
@@ -3032,6 +3042,7 @@ class _ElementWriter extends _AbstractElementWriter {
30323042
_sink.writeIf(e.isConst, 'const ');
30333043
_sink.writeIf(e.isCovariant, 'covariant ');
30343044
_sink.writeIf(e.isFinal, 'final ');
3045+
_sink.writeIf(e.hasImplicitType, 'hasImplicitType ');
30353046

30363047
if (e is FieldFormalParameterElement) {
30373048
_sink.write('this.');
@@ -3299,17 +3310,30 @@ class _ElementWriter extends _AbstractElementWriter {
32993310
_writeMetadata(e);
33003311
_writeSinceSdkVersion(e);
33013312
_writeCodeRange(e);
3313+
3314+
_assertEnclosingElement(e.typeParameters, e);
33023315
_writeTypeParameterElements(e.typeParameters);
33033316

33043317
var aliasedType = e.aliasedType;
33053318
_writeType('aliasedType', aliasedType);
33063319

33073320
var aliasedElement = e.aliasedElement;
33083321
if (aliasedElement is GenericFunctionTypeElementImpl) {
3322+
expect(aliasedElement.enclosingElement3, same(e));
33093323
_sink.writelnWithIndent('aliasedElement: GenericFunctionTypeElement');
33103324
_sink.withIndent(() {
3325+
_assertEnclosingElement(
3326+
aliasedElement.typeParameters,
3327+
aliasedElement,
3328+
);
33113329
_writeTypeParameterElements(aliasedElement.typeParameters);
3330+
3331+
_assertEnclosingElement(
3332+
aliasedElement.parameters,
3333+
aliasedElement,
3334+
);
33123335
_writeParameterElements(aliasedElement.parameters);
3336+
33133337
_writeReturnType(aliasedElement.returnType);
33143338
});
33153339
}

0 commit comments

Comments
 (0)