Skip to content

Commit 16d7b8f

Browse files
fshcheglovCommit Queue
authored andcommitted
Delete type alias augmentation tests because typedef can no longer be augmented.
Change-Id: I6dd41018d5fd51681668baafe9fcf7aeab8dea07 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450965 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent f1bf958 commit 16d7b8f

File tree

5 files changed

+13
-468
lines changed

5 files changed

+13
-468
lines changed

pkg/analyzer/api.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4168,8 +4168,8 @@ package:analyzer/dart/element/element.dart:
41684168
new (constructor: TypeAliasFragment Function())
41694169
element (getter: TypeAliasElement)
41704170
enclosingFragment (getter: LibraryFragment?)
4171-
nextFragment (getter: TypeAliasFragment?)
4172-
previousFragment (getter: TypeAliasFragment?)
4171+
nextFragment (getter: Null)
4172+
previousFragment (getter: Null)
41734173
TypeDefiningElement (class extends Object implements Element, Annotatable):
41744174
new (constructor: TypeDefiningElement Function())
41754175
firstFragment (getter: TypeDefiningFragment)

pkg/analyzer/lib/dart/element/element.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,10 +3943,10 @@ abstract class TypeAliasFragment
39433943
LibraryFragment? get enclosingFragment;
39443944

39453945
@override
3946-
TypeAliasFragment? get nextFragment;
3946+
Null get nextFragment;
39473947

39483948
@override
3949-
TypeAliasFragment? get previousFragment;
3949+
Null get previousFragment;
39503950
}
39513951

39523952
/// An element that defines a type.

pkg/analyzer/lib/src/dart/element/element.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10697,10 +10697,10 @@ class TypeAliasFragmentImpl extends FragmentImpl
1069710697
List<TypeParameterFragmentImpl> _typeParameters = const [];
1069810698

1069910699
@override
10700-
TypeAliasFragmentImpl? previousFragment;
10700+
Null previousFragment;
1070110701

1070210702
@override
10703-
TypeAliasFragmentImpl? nextFragment;
10703+
Null nextFragment;
1070410704

1070510705
/// Is `true` if the element has direct or indirect reference to itself
1070610706
/// from anywhere except a class element or type parameter bounds.
@@ -10775,12 +10775,6 @@ class TypeAliasFragmentImpl extends FragmentImpl
1077510775
@Deprecated('Use typeParameters instead')
1077610776
@override
1077710777
List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
10778-
10779-
void addFragment(TypeAliasFragmentImpl fragment) {
10780-
fragment.element = element;
10781-
fragment.previousFragment = this;
10782-
nextFragment = fragment;
10783-
}
1078410778
}
1078510779

1078610780
class TypeParameterElementImpl extends ElementImpl

pkg/analyzer/lib/src/summary2/element_builder.dart

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class ElementBuilder {
162162
fragment,
163163
);
164164
case TypeAliasFragmentImpl():
165-
_handleTypeAliasFragment(libraryFragment, lastFragment, fragment);
165+
_handleTypeAliasFragment(libraryFragment, fragment);
166166
default:
167167
throw UnimplementedError('${fragment.runtimeType}');
168168
}
@@ -804,21 +804,16 @@ class ElementBuilder {
804804

805805
void _handleTypeAliasFragment(
806806
LibraryFragmentImpl libraryFragment,
807-
FragmentImpl? lastFragment,
808807
TypeAliasFragmentImpl fragment,
809808
) {
810809
libraryFragment.addTypeAlias(fragment);
811810

812-
if (lastFragment is TypeAliasFragmentImpl && fragment.isAugmentation) {
813-
lastFragment.addFragment(fragment);
814-
} else {
815-
var element = TypeAliasElementImpl(
816-
_addTopReference('@typeAlias', fragment.name),
817-
fragment,
818-
);
819-
libraryElement.typeAliases.add(element);
820-
libraryBuilder.declare(element, element.reference);
821-
}
811+
var element = TypeAliasElementImpl(
812+
_addTopReference('@typeAlias', fragment.name),
813+
fragment,
814+
);
815+
libraryElement.typeAliases.add(element);
816+
libraryBuilder.declare(element, element.reference);
822817
}
823818

824819
List<FormalParameterFragmentImpl> _linkFormalParameters({

0 commit comments

Comments
 (0)