diff --git a/pkg/analysis_server/test/analysis/notification_implemented_test.dart b/pkg/analysis_server/test/analysis/notification_implemented_test.dart index 35a3c2f72d7..047b3d5a0ea 100644 --- a/pkg/analysis_server/test/analysis/notification_implemented_test.dart +++ b/pkg/analysis_server/test/analysis/notification_implemented_test.dart @@ -469,6 +469,7 @@ class B extends A {} assertHasImplementedMember('m()'); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_ofClass_byClass_method_inAugmented() async { newFile('$testPackageLibPath/b.dart', ''' part 'test.dart'; diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart index bee41f214dd..b113a415a2c 100644 --- a/pkg/analysis_server/test/analysis/notification_navigation_test.dart +++ b/pkg/analysis_server/test/analysis/notification_navigation_test.dart @@ -446,6 +446,7 @@ class A { assertHasTarget('bar', targetFile: aFile); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_augmentation_within_augment() async { addTestFile(r''' part of 'a.dart'; @@ -495,6 +496,7 @@ void f() { assertHasTarget('named', targetFile: aFile); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_class_augmentation_method() async { var aFile = newFile(augmentFilePath, r''' part of 'test.dart'; diff --git a/pkg/analysis_server/test/analysis/notification_overrides_test.dart b/pkg/analysis_server/test/analysis/notification_overrides_test.dart index e6b1b54006a..b77c57ed466 100644 --- a/pkg/analysis_server/test/analysis/notification_overrides_test.dart +++ b/pkg/analysis_server/test/analysis/notification_overrides_test.dart @@ -540,6 +540,7 @@ class C extends B { assertNoInterfaceMembers(); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_class_super_method_overriddenFromAugmentation() async { var augmentation = newFile('$testPackageLibPath/a.dart', ''' part of 'test.dart'; diff --git a/pkg/analysis_server/test/lsp/signature_help_test.dart b/pkg/analysis_server/test/lsp/signature_help_test.dart index 17570577a88..f4ba8e40bbb 100644 --- a/pkg/analysis_server/test/lsp/signature_help_test.dart +++ b/pkg/analysis_server/test/lsp/signature_help_test.dart @@ -337,6 +337,7 @@ void f(int a, int b) { ); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_augmentation_method() async { var content = ''' part 'a.dart'; diff --git a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart index e1c85c237b4..504d5806df3 100644 --- a/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart +++ b/pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart @@ -362,7 +362,7 @@ class A { '''); _assertSelectionState(selectionState, r''' -element: self::@class::A::@method::test +element: self::@fragment::self::@class::A::@method::test formalParameters id: 0 kind: requiredPositional diff --git a/pkg/analysis_server/test/src/computer/call_hierarchy_computer_test.dart b/pkg/analysis_server/test/src/computer/call_hierarchy_computer_test.dart index 5977e52c68f..0a810997efa 100644 --- a/pkg/analysis_server/test/src/computer/call_hierarchy_computer_test.dart +++ b/pkg/analysis_server/test/src/computer/call_hierarchy_computer_test.dart @@ -614,6 +614,7 @@ class Foo { ); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_methodCall_to_augmentation() async { var code = TestCode.parse(''' part 'other.dart'; @@ -1971,6 +1972,7 @@ class Foo { ); } + @FailingTest() // TODO(scheglov): implement augmentation Future test_method_from_augmentation() async { var code = TestCode.parse(''' part 'other.dart'; diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt index c2e3cf8b917..30c76ad7f20 100644 --- a/pkg/analyzer/api.txt +++ b/pkg/analyzer/api.txt @@ -3013,11 +3013,9 @@ package:analyzer/dart/element/element.dart: fields (getter: List) firstFragment (getter: InstanceElement) metadata (getter: List) - methods (getter: List) thisType (getter: DartType) getField (method: FieldElement? Function(String)) getGetter (method: PropertyAccessorElement? Function(String)) - getMethod (method: MethodElement? Function(String)) getSetter (method: PropertyAccessorElement? Function(String)) AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement): new (constructor: AugmentedInterfaceElement Function()) diff --git a/pkg/analyzer/lib/dart/element/element.dart b/pkg/analyzer/lib/dart/element/element.dart index 34b459dfe0d..28e22fc57e0 100644 --- a/pkg/analyzer/lib/dart/element/element.dart +++ b/pkg/analyzer/lib/dart/element/element.dart @@ -131,12 +131,6 @@ abstract class AugmentedInstanceElement { /// all its augmentations. List get metadata; - /// The methods declared in this element. - /// - /// `MethodAugmentationElement`s replace corresponding elements, other - /// [MethodElement]s are appended. - List get methods; - /// The type of `this` expression. DartType get thisType; @@ -146,9 +140,6 @@ abstract class AugmentedInstanceElement { /// Returns the getter from [accessors] that has the given [name]. PropertyAccessorElement? getGetter(String name); - /// Returns the method from [methods] that has the given [name]. - MethodElement? getMethod(String name); - /// Returns the setter from [accessors] that has the given [name]. PropertyAccessorElement? getSetter(String name); } diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart index f0f12f33ffe..3a139d9cbcd 100644 --- a/pkg/analyzer/lib/src/dart/analysis/driver.dart +++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart @@ -100,7 +100,7 @@ import 'package:meta/meta.dart'; // TODO(scheglov): Clean up the list of implicitly analyzed files. class AnalysisDriver { /// The version of data format, should be incremented on every format change. - static const int DATA_VERSION = 434; + static const int DATA_VERSION = 435; /// The number of exception contexts allowed to write. Once this field is /// zero, we stop writing any new exception contexts in this process. diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart index 4925cdc29b6..ef152d51174 100644 --- a/pkg/analyzer/lib/src/dart/element/element.dart +++ b/pkg/analyzer/lib/src/dart/element/element.dart @@ -4157,7 +4157,7 @@ class ExtensionElementImpl extends InstanceElementImpl @override MethodElementOrMember? getMethod(String methodName) { - for (var method in element.methods) { + for (var method in methods) { if (method.name == methodName) { return method; } @@ -5932,11 +5932,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2 @override List accessors = []; - @override - List methods = []; - - final List internal_methods2 = []; - @override InstanceElement2 get baseElement => this; @@ -6007,8 +6002,7 @@ abstract class InstanceElementImpl2 extends ElementImpl2 @override List get methods2 { - _readMembers(); - return internal_methods2; + return firstFragment.methods.map((e) => e.asElement2).toList(); } @override @@ -6075,18 +6069,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2 return getters2.firstWhereOrNull((e) => e.name3 == name); } - @override - MethodElement? getMethod(String name) { - var length = methods.length; - for (var i = 0; i < length; i++) { - var method = methods[i]; - if (method.name == name) { - return method; - } - } - return null; - } - @override MethodElement2OrMember? getMethod2(String name) { return methods2.firstWhereOrNull((e) => e.lookupName == name); @@ -8547,7 +8529,7 @@ class MethodElementImpl extends ExecutableElementImpl with AugmentableElement implements MethodElementOrMember, MethodFragment { @override - late MethodElementImpl2 element; + late final MethodElementImpl2 element = MethodElementImpl2(name, this); @override String? name2; @@ -8647,19 +8629,13 @@ class MethodElementImpl2 extends ExecutableElementImpl2 FragmentedElementMixin, _HasSinceSdkVersionMixin implements MethodElement2OrMember { - @override - final Reference reference; - @override final String? name3; @override final MethodElementImpl firstFragment; - MethodElementImpl2(this.reference, this.name3, this.firstFragment) { - reference.element2 = this; - firstFragment.element = this; - } + MethodElementImpl2(this.name3, this.firstFragment); @override MethodElement2 get baseElement => this; diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart index 572b6f1c4c0..2e50c08cce9 100644 --- a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart +++ b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart @@ -15,7 +15,6 @@ import 'package:analyzer/src/dart/element/type.dart'; import 'package:analyzer/src/dart/element/type_algebra.dart'; import 'package:analyzer/src/dart/element/type_system.dart'; import 'package:analyzer/src/fine/requirements.dart'; -import 'package:analyzer/src/summary2/reference.dart'; import 'package:analyzer/src/utilities/extensions/collection.dart'; import 'package:analyzer/src/utilities/extensions/element.dart'; import 'package:meta/meta.dart'; @@ -462,10 +461,10 @@ class InheritanceManager3 { void _addImplemented( Map implemented, - InterfaceElement element, - AugmentedInterfaceElement augmented, + InterfaceElementImpl fragment, + InterfaceElementImpl2 element, ) { - var libraryUri = element.librarySource.uri; + var libraryUri = fragment.librarySource.uri; void addMember(ExecutableElement member) { if (!member.isAbstract && !member.isStatic) { @@ -474,8 +473,8 @@ class InheritanceManager3 { } } - augmented.methods.forEach(addMember); - augmented.accessors.forEach(addMember); + element.methods2.map((e) => e.asElement).forEach(addMember); + element.accessors.forEach(addMember); } void _addMixinMembers({ @@ -1088,11 +1087,6 @@ class InheritanceManager3 { result.parameters = transformedParameters; result.returnType = executable.returnType; result.typeParameters = executable.typeParameters.cast(); - result.element = MethodElementImpl2( - Reference.root(), // TODO(scheglov): wrong - executable.name, - result, - ); return result; } @@ -1165,11 +1159,6 @@ class InheritanceManager3 { result.returnType = resultType.returnType; // TODO(scheglov): check if can type cast instead result.parameters = resultType.parameters.cast(); - result.element = MethodElementImpl2( - Reference.root(), // TODO(scheglov): wrong - firstMethod.name, - result, - ); return result; } else { var firstAccessor = first as PropertyAccessorElement; @@ -1203,22 +1192,24 @@ class InheritanceManager3 { } static Map _getTypeMembers( - InterfaceElement element, - InterfaceElementImpl2 augmented, + InterfaceElementImpl fragment, + InterfaceElementImpl2 element, ) { var declared = {}; - var libraryUri = element.librarySource.uri; + var libraryUri = fragment.librarySource.uri; - var methods = augmented.methods; + var methods = element.methods2; for (var i = 0; i < methods.length; i++) { var method = methods[i]; if (!method.isStatic) { - var name = Name(libraryUri, method.name); - declared[name] = method; + var name = Name.forElement(method); + if (name != null) { + declared[name] = method.asElement; + } } } - var accessors = augmented.accessors; + var accessors = element.accessors; for (var i = 0; i < accessors.length; i++) { var accessor = accessors[i]; if (!accessor.isStatic) { diff --git a/pkg/analyzer/lib/src/generated/testing/element_factory.dart b/pkg/analyzer/lib/src/generated/testing/element_factory.dart index a0b92d1eec5..d54eb74d50e 100644 --- a/pkg/analyzer/lib/src/generated/testing/element_factory.dart +++ b/pkg/analyzer/lib/src/generated/testing/element_factory.dart @@ -234,7 +234,6 @@ class ElementFactory { MethodElementImpl method = MethodElementImpl(methodName, 0); method.parameters = _requiredParameters(argumentTypes); method.returnType = returnType; - MethodElementImpl2(Reference.root(), methodName, method); return method; } diff --git a/pkg/analyzer/lib/src/summary2/augmentation.dart b/pkg/analyzer/lib/src/summary2/augmentation.dart index 942283f886a..f4e19b9857e 100644 --- a/pkg/analyzer/lib/src/summary2/augmentation.dart +++ b/pkg/analyzer/lib/src/summary2/augmentation.dart @@ -272,7 +272,6 @@ abstract class InstanceElementBuilder { augmented.fields = reader.readElementList(); augmented.constructors = reader.readElementList(); augmented.accessors = reader.readElementList(); - augmented.methods = reader.readElementList(); } applyConstantOffsets?.perform(); @@ -388,7 +387,6 @@ class EnumElementLinkedData extends ElementLinkedData { augmented.fields = reader.readElementList(); augmented.constructors = reader.readElementList(); augmented.accessors = reader.readElementList(); - augmented.methods = reader.readElementList(); } applyConstantOffsets?.perform(); } @@ -421,7 +419,6 @@ class ExtensionElementLinkedData var augmented = element.augmentedInternal; augmented.fields = reader.readElementList(); augmented.accessors = reader.readElementList(); - augmented.methods = reader.readElementList(); augmented.extendedType = extendedType; } @@ -458,7 +455,6 @@ class ExtensionTypeElementLinkedData augmented.fields = reader.readElementList(); augmented.accessors = reader.readElementList(); augmented.constructors = reader.readElementList(); - augmented.methods = reader.readElementList(); augmented ..primaryConstructor = element.constructors.first ..representation = element.fields.first @@ -630,7 +626,6 @@ class LibraryReader { int _classMembersLengthsIndex = 0; late final LibraryElementImpl _libraryElement; - late InstanceElementImpl2 _currentInstanceElement; LibraryReader._({ required LinkedElementFactory elementFactory, @@ -756,11 +751,9 @@ class LibraryReader { fragment.name2 = fragmentName; if (reference2.element2 case ClassElementImpl2 element?) { - _currentInstanceElement = element; fragment.augmentedInternal = element; } else { var element = ClassElementImpl2(reference2, fragment); - _currentInstanceElement = element; _libraryElement.classes.add(element); } @@ -792,9 +785,7 @@ class LibraryReader { ClassElementImpl fragment, Reference reference, ) { - // print('[_readClassElementMembers][reference: $reference]'); var unitElement = fragment.enclosingElement3; - _currentInstanceElement = fragment.element; var accessors = []; var fields = []; @@ -930,11 +921,9 @@ class LibraryReader { fragment.name2 = fragmentName; if (reference2.element2 case EnumElementImpl2 element?) { - _currentInstanceElement = element; fragment.augmentedInternal = element; } else { var element = EnumElementImpl2(reference2, fragment); - _currentInstanceElement = element; _libraryElement.enums.add(element); } @@ -1030,11 +1019,9 @@ class LibraryReader { fragment.name2 = fragmentName; if (reference2.element2 case ExtensionElementImpl2 element?) { - _currentInstanceElement = element; fragment.augmentedInternal = element; } else { var element = ExtensionElementImpl2(reference2, fragment); - _currentInstanceElement = element; _libraryElement.extensions.add(element); } @@ -1090,11 +1077,9 @@ class LibraryReader { fragment.name2 = fragmentName; if (reference2.element2 case ExtensionTypeElementImpl2 element?) { - _currentInstanceElement = element; fragment.augmentedInternal = element; } else { var element = ExtensionTypeElementImpl2(reference2, fragment); - _currentInstanceElement = element; _libraryElement.extensionTypes.add(element); } @@ -1364,20 +1349,12 @@ class LibraryReader { return _reader.readTypedList(() { var resolutionOffset = _baseResolutionOffset + _reader.readUInt30(); var reference = _readReference(); - var reference2 = _readReference(); var fragmentName = _readFragmentName(); // TODO(scheglov): we do this only because MethodElement2 uses this name. var name = _reader.readStringReference(); var fragment = MethodElementImpl(name, -1); fragment.name2 = fragmentName; - if (reference2.element2 case MethodElementImpl2 element) { - fragment.element = element; - } else { - var element = MethodElementImpl2(reference2, fragment.name2, fragment); - _currentInstanceElement.internal_methods2.add(element); - } - var linkedData = MethodElementLinkedData( reference: reference, libraryReader: this, @@ -1410,11 +1387,9 @@ class LibraryReader { fragment.name2 = fragmentName; if (reference2.element2 case MixinElementImpl2 element?) { - _currentInstanceElement = element; fragment.augmentedInternal = element; } else { var element = MixinElementImpl2(reference2, fragment); - _currentInstanceElement = element; _libraryElement.mixins.add(element); } @@ -2000,7 +1975,6 @@ class MixinElementLinkedData extends ElementLinkedData { augmented.interfaces = reader._readInterfaceTypeList(); augmented.fields = reader.readElementList(); augmented.accessors = reader.readElementList(); - augmented.methods = reader.readElementList(); } applyConstantOffsets?.perform(); diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart index 6c29ca7c841..10b6b92a7d1 100644 --- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart +++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart @@ -164,7 +164,6 @@ class BundleWriter { _resolutionSink._writeElementList(element.fields); _resolutionSink._writeElementList(element.constructors); _resolutionSink._writeElementList(element.accessors); - _resolutionSink._writeElementList(element.methods); } if (!fragment.isMixinApplication) { @@ -258,7 +257,6 @@ class BundleWriter { _resolutionSink._writeElementList(element.fields); _resolutionSink._writeElementList(element.constructors); _resolutionSink._writeElementList(element.accessors); - _resolutionSink._writeElementList(element.methods); } _writeList( @@ -320,7 +318,6 @@ class BundleWriter { _resolutionSink.writeType(element.extendedType); _resolutionSink._writeElementList(element.fields); _resolutionSink._writeElementList(element.accessors); - _resolutionSink._writeElementList(element.methods); } _writeList( @@ -353,7 +350,6 @@ class BundleWriter { _resolutionSink._writeElementList(element.fields); _resolutionSink._writeElementList(element.accessors); _resolutionSink._writeElementList(element.constructors); - _resolutionSink._writeElementList(element.methods); _resolutionSink.writeType(element.typeErasure); } @@ -493,7 +489,6 @@ class BundleWriter { void _writeMethodElement(MethodElementImpl fragment) { _sink.writeUInt30(_resolutionSink.offset); _writeReference(fragment); - _writeReference2(fragment.element.reference); _writeFragmentName(fragment); _sink._writeStringReference(fragment.name); MethodElementFlags.write(_sink, fragment); @@ -528,7 +523,6 @@ class BundleWriter { _resolutionSink._writeTypeList(element.interfaces); _resolutionSink._writeElementList(element.fields); _resolutionSink._writeElementList(element.accessors); - _resolutionSink._writeElementList(element.methods); } _writeList( diff --git a/pkg/analyzer/lib/src/summary2/element_builder.dart b/pkg/analyzer/lib/src/summary2/element_builder.dart index e306b522aa9..f0bb1964469 100644 --- a/pkg/analyzer/lib/src/summary2/element_builder.dart +++ b/pkg/analyzer/lib/src/summary2/element_builder.dart @@ -1244,20 +1244,6 @@ class ElementBuilder extends ThrowingAstVisitor { if (fragment.isAugmentation) { fragment.augmentationTargetAny = lastFragment; } - - if (fragment.isAugmentation && lastFragment is MethodElementImpl) { - lastFragment.augmentation = fragment; - fragment.element = lastFragment.element; - } else { - var element = MethodElementImpl2( - enclosingBuilder.element.reference! - .getChild('@method') - .addChild(refName), - fragment.name2, - fragment, - ); - enclosingBuilder.element.internal_methods2.add(element); - } } } executableFragment.hasImplicitReturnType = node.returnType == null; diff --git a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart index df5fc39ef8d..dbdbbfdd958 100644 --- a/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart +++ b/pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart @@ -949,7 +949,6 @@ class _MockSdkElementsBuilder { element.fields = fragment.fields; element.constructors = fragment.constructors; element.accessors = fragment.accessors; - element.methods = fragment.methods; } LibraryElementImpl _buildCore() { @@ -1087,7 +1086,6 @@ class _MockSdkElementsBuilder { .toList() ..returnType = returnType ..typeParameters = typeFormals; - MethodElementImpl2(Reference.root(), name, fragment); return fragment; } diff --git a/pkg/analyzer/test/generated/elements_types_mixin.dart b/pkg/analyzer/test/generated/elements_types_mixin.dart index d65fccc8cbe..95376169afb 100644 --- a/pkg/analyzer/test/generated/elements_types_mixin.dart +++ b/pkg/analyzer/test/generated/elements_types_mixin.dart @@ -141,7 +141,6 @@ mixin ElementsTypesMixin { var element = ClassElementImpl2(Reference.root(), fragment); element.mixins = fragment.mixins; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return fragment; } @@ -172,7 +171,6 @@ mixin ElementsTypesMixin { var element = ClassElementImpl2(Reference.root(), fragment); element.mixins = fragment.mixins; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return element; } @@ -506,7 +504,6 @@ mixin ElementsTypesMixin { var element = MixinElementImpl2(Reference.root(), fragment); element.superclassConstraints = fragment.superclassConstraints; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return fragment; } @@ -529,7 +526,6 @@ mixin ElementsTypesMixin { var element = MixinElementImpl2(Reference.root(), fragment); element.superclassConstraints = fragment.superclassConstraints; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return element; } diff --git a/pkg/analyzer/test/src/dart/element/element_test.dart b/pkg/analyzer/test/src/dart/element/element_test.dart index ebb3ffb1816..b71344e717a 100644 --- a/pkg/analyzer/test/src/dart/element/element_test.dart +++ b/pkg/analyzer/test/src/dart/element/element_test.dart @@ -1725,6 +1725,7 @@ class A { expect(classA.lookUpMethod2(name: 'm', library: library), same(method)); } + @FailingTest() // TODO(scheglov): implement augmentation test_lookUpMethod_fromAugmentation() async { newFile('$testPackageLibPath/a.dart', ''' part of 'test.dart'; @@ -2086,7 +2087,6 @@ class _AbstractTypeSystemTest extends AbstractTypeSystemTest { var element = ClassElementImpl2(Reference.root(), fragment); element.mixins = fragment.mixins; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return fragment; } @@ -2119,7 +2119,6 @@ class _AbstractTypeSystemTest extends AbstractTypeSystemTest { var element = MixinElementImpl2(Reference.root(), fragment); element.superclassConstraints = fragment.superclassConstraints; element.interfaces = fragment.interfaces; - element.methods = fragment.methods; return fragment; } diff --git a/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart b/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart index 4980936653d..2750c00891c 100644 --- a/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart +++ b/pkg/analyzer/test/src/dart/element/generic_inferrer_test.dart @@ -77,7 +77,6 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { ), ], ); - C.methods = [m]; C.firstFragment.methods = [m]; // } @@ -131,7 +130,6 @@ class GenericFunctionInferenceTest extends AbstractTypeSystemTest { ), ], ); - C.methods = [m]; C.firstFragment.methods = [m]; // } diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart index 1be15e94b9a..9e22c1bb074 100644 --- a/pkg/analyzer/test/src/summary/element_text.dart +++ b/pkg/analyzer/test/src/summary/element_text.dart @@ -2066,11 +2066,6 @@ class _ElementWriter extends _AbstractElementWriter { _elementPrinter.writeElementList('accessors', sorted); } - void writeMethods() { - var sorted = element.methods.sortedBy((e) => e.name); - _elementPrinter.writeElementList('methods', sorted); - } - _sink.writelnWithIndent('augmented'); _sink.withIndent(() { switch (element) { @@ -2080,7 +2075,6 @@ class _ElementWriter extends _AbstractElementWriter { writeFields(); writeConstructors(); writeAccessors(); - writeMethods(); case EnumElementImpl2(): _elementPrinter.writeTypeList('mixins', element.mixins); _elementPrinter.writeTypeList('interfaces', element.interfaces); @@ -2091,17 +2085,14 @@ class _ElementWriter extends _AbstractElementWriter { ); writeConstructors(); writeAccessors(); - writeMethods(); case ExtensionElementImpl2(): writeFields(); writeAccessors(); - writeMethods(); case ExtensionTypeElementImpl2(): _elementPrinter.writeTypeList('interfaces', element.interfaces); writeFields(); writeConstructors(); writeAccessors(); - writeMethods(); case MixinElementImpl2(): _elementPrinter.writeTypeList( 'superclassConstraints', @@ -2110,7 +2101,6 @@ class _ElementWriter extends _AbstractElementWriter { _elementPrinter.writeTypeList('interfaces', element.interfaces); writeFields(); writeAccessors(); - writeMethods(); default: // TODO(scheglov): Add other types and properties throw UnimplementedError('${e.runtimeType}'); diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart index 92b801adac3..53cc2cd4a2f 100644 --- a/pkg/analyzer/test/src/summary/elements/class_test.dart +++ b/pkg/analyzer/test/src/summary/elements/class_test.dart @@ -7543,7 +7543,6 @@ library redirectedConstructor: ::@class::C::@constructor::new#element methods abstract B_ - reference: ::@class::B::@method::B_ firstFragment: ::@class::B::@method::B_ class C reference: ::@class::C @@ -13663,7 +13662,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -13815,7 +13813,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -13968,7 +13965,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods noSuchMethod - reference: ::@class::D::@method::noSuchMethod firstFragment: ::@class::D::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14083,7 +14079,6 @@ library Object methods noSuchMethod - reference: ::@mixin::M::@method::noSuchMethod firstFragment: ::@mixin::M::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14256,7 +14251,6 @@ library firstFragment: ::@enum::E::@getter::values methods noSuchMethod - reference: ::@enum::E::@method::noSuchMethod firstFragment: ::@enum::E::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14364,7 +14358,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14467,7 +14460,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14556,7 +14548,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods abstract A - reference: ::@class::B::@method::A firstFragment: ::@class::B::@method::A formalParameters requiredPositional final hasImplicitType value @@ -14572,7 +14563,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14701,7 +14691,6 @@ library firstFragment: ::@class::C::@constructor::new methods noSuchMethod - reference: ::@class::C::@method::noSuchMethod firstFragment: ::@class::C::@method::noSuchMethod formalParameters requiredPositional invocation @@ -14805,7 +14794,6 @@ library A methods noSuchMethod - reference: ::@mixin::M::@method::noSuchMethod firstFragment: ::@mixin::M::@method::noSuchMethod formalParameters requiredPositional invocation @@ -17037,7 +17025,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo class B reference: ::@class::B @@ -17746,7 +17733,6 @@ library firstFragment: ::@class::A::@constructor::new methods get - reference: ::@class::A::@method::get firstFragment: ::@class::A::@method::get '''); } @@ -18707,7 +18693,6 @@ library firstFragment: ::@class::C::@constructor::new methods abstract f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -18772,7 +18757,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -18837,7 +18821,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -18900,7 +18883,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f documentationComment: /**\n * Docs\n */ '''); @@ -18956,7 +18938,6 @@ library firstFragment: ::@class::C::@constructor::new methods external f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -19075,7 +19056,6 @@ library superConstructor: ::@class::D::@constructor::new#element methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional hasImplicitType value @@ -19088,7 +19068,6 @@ library firstFragment: ::@class::D::@constructor::new methods abstract f - reference: ::@class::D::@method::f firstFragment: ::@class::D::@method::f formalParameters requiredPositional value @@ -19182,7 +19161,6 @@ library superConstructor: ::@class::D::@constructor::new#element methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f abstract class D reference: ::@class::D @@ -19192,7 +19170,6 @@ library firstFragment: ::@class::D::@constructor::new methods abstract f - reference: ::@class::D::@method::f firstFragment: ::@class::D::@method::f '''); } @@ -19253,7 +19230,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo '''); } @@ -19311,8 +19287,7 @@ library synthetic new firstFragment: ::@class::A::@constructor::new methods - - reference: ::@class::A::@method::0 + firstFragment: ::@class::A::@method::0 '''); } @@ -19398,7 +19373,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods A - reference: ::@class::B::@method::A firstFragment: ::@class::B::@method::A '''); } @@ -19457,7 +19431,6 @@ library firstFragment: ::@class::C::@constructor::new methods external m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } @@ -19522,7 +19495,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional hasImplicitType x @@ -19582,7 +19554,6 @@ library firstFragment: ::@class::C::@constructor::new methods static f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -19643,7 +19614,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -19714,7 +19684,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f typeParameters T @@ -19816,7 +19785,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f typeParameters V @@ -19900,7 +19868,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f typeParameters T @@ -19971,10 +19938,8 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f g - reference: ::@class::C::@method::g firstFragment: ::@class::C::@method::g '''); } @@ -22073,7 +22038,6 @@ library firstFragment: ::@class::C::@constructor::new methods + - reference: ::@class::C::@method::+ firstFragment: ::@class::C::@method::+ formalParameters requiredPositional other @@ -22141,7 +22105,6 @@ library firstFragment: ::@class::C::@constructor::new methods == - reference: ::@class::C::@method::== firstFragment: ::@class::C::@method::== formalParameters requiredPositional other @@ -22206,7 +22169,6 @@ library firstFragment: ::@class::C::@constructor::new methods external + - reference: ::@class::C::@method::+ firstFragment: ::@class::C::@method::+ formalParameters requiredPositional other @@ -22274,7 +22236,6 @@ library firstFragment: ::@class::C::@constructor::new methods >= - reference: ::@class::C::@method::>= firstFragment: ::@class::C::@method::>= formalParameters requiredPositional other @@ -22339,7 +22300,6 @@ library firstFragment: ::@class::C::@constructor::new methods [] - reference: ::@class::C::@method::[] firstFragment: ::@class::C::@method::[] formalParameters requiredPositional i @@ -22411,7 +22371,6 @@ library firstFragment: ::@class::C::@constructor::new methods []= - reference: ::@class::C::@method::[]= firstFragment: ::@class::C::@method::[]= formalParameters requiredPositional i @@ -22481,7 +22440,6 @@ library firstFragment: ::@class::C::@constructor::new methods <= - reference: ::@class::C::@method::<= firstFragment: ::@class::C::@method::<= formalParameters requiredPositional other @@ -22549,7 +22507,6 @@ library firstFragment: ::@class::A::@constructor::new methods - - reference: ::@class::A::@method::- firstFragment: ::@class::A::@method::- formalParameters requiredPositional other @@ -22610,8 +22567,7 @@ library synthetic new firstFragment: ::@class::A::@constructor::new methods - - - reference: ::@class::A::@method::unary- + unary- firstFragment: ::@class::A::@method::unary- '''); } @@ -24783,7 +24739,6 @@ library firstFragment: ::@class::A::@constructor::new methods set - reference: ::@class::A::@method::set firstFragment: ::@class::A::@method::set formalParameters requiredPositional _ @@ -31060,7 +31015,6 @@ library type: int methods f - reference: ::@class::E::@method::f firstFragment: ::@class::E::@method::f '''); } @@ -31635,7 +31589,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f topLevelVariables c diff --git a/pkg/analyzer/test/src/summary/elements/const_test.dart b/pkg/analyzer/test/src/summary/elements/const_test.dart index e94bb475e14..8ccfc146460 100644 --- a/pkg/analyzer/test/src/summary/elements/const_test.dart +++ b/pkg/analyzer/test/src/summary/elements/const_test.dart @@ -7022,7 +7022,6 @@ library firstFragment: ::@class::C::@constructor::new methods static length - reference: ::@class::C::@method::length firstFragment: ::@class::C::@method::length topLevelVariables const hasInitializer v @@ -8840,7 +8839,6 @@ library expression: expression_1 methods methodPositional - reference: ::@class::C::@method::methodPositional firstFragment: ::@class::C::@method::methodPositional formalParameters optionalPositional hasImplicitType p @@ -8848,13 +8846,11 @@ library constantInitializer expression: expression_2 methodPositionalWithoutDefault - reference: ::@class::C::@method::methodPositionalWithoutDefault firstFragment: ::@class::C::@method::methodPositionalWithoutDefault formalParameters optionalPositional hasImplicitType p type: dynamic methodNamed - reference: ::@class::C::@method::methodNamed firstFragment: ::@class::C::@method::methodNamed formalParameters optionalNamed hasImplicitType p @@ -8864,7 +8860,6 @@ library fragment: ::@class::C::@method::methodNamed::@parameter::p expression: expression_3 methodNamedWithoutDefault - reference: ::@class::C::@method::methodNamedWithoutDefault firstFragment: ::@class::C::@method::methodNamedWithoutDefault formalParameters optionalNamed hasImplicitType p @@ -10171,7 +10166,6 @@ library firstFragment: ::@class::C::@constructor::new methods static m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional a @@ -10527,7 +10521,6 @@ library firstFragment: ::@extension::E methods static f - reference: ::@extension::E::@method::f firstFragment: ::@extension::E::@method::f topLevelVariables const hasInitializer x @@ -18394,7 +18387,6 @@ library firstFragment: ::@class::C::@getter::a methods static m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } diff --git a/pkg/analyzer/test/src/summary/elements/default_value_test.dart b/pkg/analyzer/test/src/summary/elements/default_value_test.dart index 96a3c3f080d..2f5f184e864 100644 --- a/pkg/analyzer/test/src/summary/elements/default_value_test.dart +++ b/pkg/analyzer/test/src/summary/elements/default_value_test.dart @@ -98,7 +98,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract X - reference: ::@class::A::@method::X firstFragment: ::@class::A::@method::X formalParameters optionalNamed a @@ -453,7 +452,6 @@ library firstFragment: ::@class::B::@constructor::new methods foo - reference: ::@class::B::@method::foo firstFragment: ::@class::B::@method::foo formalParameters optionalNamed hasImplicitType a @@ -1051,10 +1049,8 @@ library firstFragment: ::@extension::E methods static f - reference: ::@extension::E::@method::f firstFragment: ::@extension::E::@method::f static g - reference: ::@extension::E::@method::g firstFragment: ::@extension::E::@method::g formalParameters optionalPositional p @@ -1196,7 +1192,6 @@ library firstFragment: ::@class::C::@constructor::new methods foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo formalParameters optionalPositional b @@ -1766,7 +1761,6 @@ library firstFragment: ::@class::C::@constructor::new methods foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo typeParameters T @@ -1924,7 +1918,6 @@ library firstFragment: ::@class::C::@constructor::new methods foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo typeParameters E2 @@ -2071,7 +2064,6 @@ library firstFragment: ::@class::C::@constructor::new methods foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo formalParameters optionalPositional b diff --git a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart index 96d34d14a5e..f6ac43fe512 100644 --- a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart +++ b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart @@ -624,10 +624,8 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo::@def::0 firstFragment: ::@class::A::@method::foo::@def::0 foo - reference: ::@class::A::@method::foo::@def::1 firstFragment: ::@class::A::@method::foo::@def::1 '''); } diff --git a/pkg/analyzer/test/src/summary/elements/enum_test.dart b/pkg/analyzer/test/src/summary/elements/enum_test.dart index 5ddc40e5da6..ee3a1466ab9 100644 --- a/pkg/analyzer/test/src/summary/elements/enum_test.dart +++ b/pkg/analyzer/test/src/summary/elements/enum_test.dart @@ -4957,7 +4957,6 @@ library firstFragment: ::@enum::E::@getter::values methods foo - reference: ::@enum::E::@method::foo firstFragment: ::@enum::E::@method::foo typeParameters U @@ -5131,7 +5130,6 @@ library firstFragment: ::@enum::E::@getter::values methods toString - reference: ::@enum::E::@method::toString firstFragment: ::@enum::E::@method::toString '''); } @@ -8671,7 +8669,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo class B reference: ::@class::B @@ -8683,7 +8680,6 @@ library firstFragment: ::@class::B::@constructor::new methods foo - reference: ::@class::B::@method::foo firstFragment: ::@class::B::@method::foo class C reference: ::@class::C @@ -8696,7 +8692,6 @@ library firstFragment: ::@class::C::@constructor::new methods foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo class alias D reference: ::@class::D @@ -9940,7 +9935,6 @@ library firstFragment: ::@enum::E::@getter::values methods foo - reference: ::@enum::E::@method::foo firstFragment: ::@enum::E::@method::foo metadata Annotation @@ -10267,7 +10261,6 @@ library firstFragment: ::@enum::E::@getter::foo methods bar - reference: ::@enum::E::@method::bar firstFragment: ::@enum::E::@method::bar metadata Annotation diff --git a/pkg/analyzer/test/src/summary/elements/extension_test.dart b/pkg/analyzer/test/src/summary/elements/extension_test.dart index 717d79a3e72..507771ddd42 100644 --- a/pkg/analyzer/test/src/summary/elements/extension_test.dart +++ b/pkg/analyzer/test/src/summary/elements/extension_test.dart @@ -396,7 +396,6 @@ library firstFragment: ::@extension::E::@getter::foo methods bar - reference: ::@extension::E::@method::bar firstFragment: ::@extension::E::@method::bar metadata Annotation diff --git a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart index 36ab6364db5..66a6d2a2f98 100644 --- a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart +++ b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart @@ -2408,7 +2408,6 @@ library firstFragment: ::@extensionType::A::@getter::it methods foo - reference: ::@extensionType::A::@method::foo firstFragment: ::@extensionType::A::@method::foo formalParameters requiredPositional a @@ -2509,7 +2508,6 @@ library firstFragment: ::@extensionType::A::@getter::it methods foo - reference: ::@extensionType::A::@method::foo firstFragment: ::@extensionType::A::@method::foo formalParameters optionalNamed a diff --git a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart index 89d6126c33b..ef23ebc93f5 100644 --- a/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart +++ b/pkg/analyzer/test/src/summary/elements/formal_parameter_test.dart @@ -119,7 +119,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters optionalNamed covariant a @@ -188,7 +187,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters optionalPositional covariant a @@ -256,7 +254,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional covariant a @@ -378,7 +375,6 @@ library firstFragment: ::@class::A::@constructor::new methods f - reference: ::@class::A::@method::f firstFragment: ::@class::A::@method::f formalParameters requiredPositional covariant t @@ -395,7 +391,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods f - reference: ::@class::B::@method::f firstFragment: ::@class::B::@method::f formalParameters requiredPositional covariant t @@ -503,7 +498,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters optionalNamed covariant a @@ -519,7 +513,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters optionalNamed covariant a @@ -589,7 +582,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional g @@ -674,7 +666,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional g @@ -741,7 +732,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional g @@ -805,7 +795,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional g @@ -1227,7 +1216,6 @@ library firstFragment: ::@class::C::@constructor::new methods static positional - reference: ::@class::C::@method::positional firstFragment: ::@class::C::@method::positional formalParameters optionalPositional hasImplicitType x @@ -1235,7 +1223,6 @@ library constantInitializer expression: expression_0 static named - reference: ::@class::C::@method::named firstFragment: ::@class::C::@method::named formalParameters optionalNamed hasImplicitType x diff --git a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart index bba6a9196c2..a6b9732df62 100644 --- a/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart +++ b/pkg/analyzer/test/src/summary/elements/function_type_annotation_test.dart @@ -330,7 +330,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } diff --git a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart index ab75c41d296..b12d2b87a0f 100644 --- a/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart +++ b/pkg/analyzer/test/src/summary/elements/local_declarations_test.dart @@ -160,7 +160,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } @@ -328,7 +327,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } diff --git a/pkg/analyzer/test/src/summary/elements/metadata_test.dart b/pkg/analyzer/test/src/summary/elements/metadata_test.dart index 62103ce86d6..7fda0c43701 100644 --- a/pkg/analyzer/test/src/summary/elements/metadata_test.dart +++ b/pkg/analyzer/test/src/summary/elements/metadata_test.dart @@ -741,7 +741,6 @@ library firstFragment: ::@class::C::@getter::foo methods bar - reference: ::@class::C::@method::bar firstFragment: ::@class::C::@method::bar metadata Annotation @@ -5313,7 +5312,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m metadata Annotation @@ -5499,7 +5497,6 @@ library Object methods m - reference: ::@mixin::M::@method::m firstFragment: ::@mixin::M::@method::m metadata Annotation @@ -5885,7 +5882,6 @@ library firstFragment: ::@mixin::M::@getter::foo methods bar - reference: ::@mixin::M::@method::bar firstFragment: ::@mixin::M::@method::bar metadata Annotation @@ -6641,7 +6637,6 @@ library firstFragment: ::@class::A::@constructor::new methods method - reference: ::@class::A::@method::method firstFragment: ::@class::A::@method::method metadata Annotation @@ -9795,7 +9790,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType x diff --git a/pkg/analyzer/test/src/summary/elements/mixin_test.dart b/pkg/analyzer/test/src/summary/elements/mixin_test.dart index 1554caf0ce7..7661e3fadf2 100644 --- a/pkg/analyzer/test/src/summary/elements/mixin_test.dart +++ b/pkg/analyzer/test/src/summary/elements/mixin_test.dart @@ -290,7 +290,6 @@ library type: int methods m - reference: ::@mixin::M::@method::m firstFragment: ::@mixin::M::@method::m formalParameters requiredPositional v @@ -1994,7 +1993,6 @@ library Object methods foo - reference: ::@mixin::M::@method::foo firstFragment: ::@mixin::M::@method::foo '''); } @@ -2070,7 +2068,6 @@ library A methods A - reference: ::@mixin::B::@method::A firstFragment: ::@mixin::B::@method::A '''); } diff --git a/pkg/analyzer/test/src/summary/elements/offsets_test.dart b/pkg/analyzer/test/src/summary/elements/offsets_test.dart index b5107d15ad1..7f035be7b19 100644 --- a/pkg/analyzer/test/src/summary/elements/offsets_test.dart +++ b/pkg/analyzer/test/src/summary/elements/offsets_test.dart @@ -3040,14 +3040,11 @@ library firstFragment: ::@class::C::@constructor::new methods raw - reference: ::@class::C::@method::raw firstFragment: ::@class::C::@method::raw hasDocComment - reference: ::@class::C::@method::hasDocComment firstFragment: ::@class::C::@method::hasDocComment documentationComment: /// Comment 1.\n/// Comment 2. hasAnnotation - reference: ::@class::C::@method::hasAnnotation firstFragment: ::@class::C::@method::hasAnnotation metadata Annotation @@ -3063,7 +3060,6 @@ library element: dart:core::::@class::Object::@constructor::new element2: dart:core::::@class::Object::@constructor::new#element annotationThenComment - reference: ::@class::C::@method::annotationThenComment firstFragment: ::@class::C::@method::annotationThenComment documentationComment: /// Comment 1.\n/// Comment 2. metadata @@ -3080,7 +3076,6 @@ library element: dart:core::::@class::Object::@constructor::new element2: dart:core::::@class::Object::@constructor::new#element commentThenAnnotation - reference: ::@class::C::@method::commentThenAnnotation firstFragment: ::@class::C::@method::commentThenAnnotation documentationComment: /// Comment 1.\n/// Comment 2. metadata @@ -3097,7 +3092,6 @@ library element: dart:core::::@class::Object::@constructor::new element2: dart:core::::@class::Object::@constructor::new#element commentAroundAnnotation - reference: ::@class::C::@method::commentAroundAnnotation firstFragment: ::@class::C::@method::commentAroundAnnotation documentationComment: /// Comment 2. metadata @@ -4872,7 +4866,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo typeParameters T diff --git a/pkg/analyzer/test/src/summary/elements/record_type_test.dart b/pkg/analyzer/test/src/summary/elements/record_type_test.dart index cbcd431068e..82afa8838ea 100644 --- a/pkg/analyzer/test/src/summary/elements/record_type_test.dart +++ b/pkg/analyzer/test/src/summary/elements/record_type_test.dart @@ -223,7 +223,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo formalParameters requiredPositional a @@ -285,7 +284,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo '''); } diff --git a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart index bf653f036a9..5d33519630f 100644 --- a/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart +++ b/pkg/analyzer/test/src/summary/elements/since_sdk_version_test.dart @@ -328,7 +328,6 @@ library sinceSdkVersion: 2.15.0 methods foo - reference: dart:foo::@class::A::@method::foo firstFragment: dart:foo::::@class::A::@method::foo sinceSdkVersion: 2.15.0 '''); @@ -384,7 +383,6 @@ library sinceSdkVersion: 2.15.0 methods foo - reference: dart:foo::@class::A::@method::foo firstFragment: dart:foo::::@class::A::@method::foo sinceSdkVersion: 2.16.0 '''); @@ -440,7 +438,6 @@ library sinceSdkVersion: 2.15.0 methods foo - reference: dart:foo::@class::A::@method::foo firstFragment: dart:foo::::@class::A::@method::foo sinceSdkVersion: 2.15.0 '''); @@ -835,7 +832,6 @@ library sinceSdkVersion: 2.15.0 methods foo - reference: dart:foo::@enum::E::@method::foo firstFragment: dart:foo::::@enum::E::@method::foo sinceSdkVersion: 2.15.0 '''); @@ -891,7 +887,6 @@ library sinceSdkVersion: 2.15.0 methods foo - reference: dart:foo::@extension::E::@method::foo firstFragment: dart:foo::::@extension::E::@method::foo sinceSdkVersion: 2.15.0 '''); @@ -950,7 +945,6 @@ library Object methods foo - reference: dart:foo::@mixin::M::@method::foo firstFragment: dart:foo::::@mixin::M::@method::foo sinceSdkVersion: 2.15.0 '''); diff --git a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart index 563cf356cf2..d69452a7e6f 100644 --- a/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart +++ b/pkg/analyzer/test/src/summary/elements/top_level_variable_test.dart @@ -2436,7 +2436,6 @@ library firstFragment: ::@extension::E methods static f - reference: ::@extension::E::@method::f firstFragment: ::@extension::E::@method::f topLevelVariables hasInitializer x diff --git a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart index db086ad5694..969c66447db 100644 --- a/pkg/analyzer/test/src/summary/elements/type_inference_test.dart +++ b/pkg/analyzer/test/src/summary/elements/type_inference_test.dart @@ -1793,7 +1793,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f typeParameters U @@ -2232,7 +2231,6 @@ library firstFragment: ::@class::A::@getter::bar methods static baz - reference: ::@class::A::@method::baz firstFragment: ::@class::A::@method::baz '''); } @@ -3697,7 +3695,6 @@ library superConstructor: ::@class::D::@constructor::new#element methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional x @@ -3715,7 +3712,6 @@ library firstFragment: ::@class::D::@constructor::new methods abstract f - reference: ::@class::D::@method::f firstFragment: ::@class::D::@method::f formalParameters requiredPositional x @@ -3812,7 +3808,6 @@ library superConstructor: package:test/a.dart::::@class::D::@constructor::new#element methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional x @@ -3925,7 +3920,6 @@ library superConstructor: ::@class::D::@constructor::new#element methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f formalParameters requiredPositional x @@ -3940,7 +3934,6 @@ library firstFragment: ::@class::D::@constructor::new methods abstract f - reference: ::@class::D::@method::f firstFragment: ::@class::D::@method::f formalParameters requiredPositional x @@ -4390,7 +4383,6 @@ library superConstructor: package:test/a.dart::::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType p @@ -4987,7 +4979,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m abstract class B reference: ::@class::B @@ -4997,7 +4988,6 @@ library firstFragment: ::@class::B::@constructor::new methods abstract m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m abstract class C reference: ::@class::C @@ -5176,7 +5166,6 @@ library firstFragment: ::@class::A::@constructor::new methods call - reference: ::@class::A::@method::call firstFragment: ::@class::A::@method::call class B reference: ::@class::B @@ -8007,7 +7996,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional p diff --git a/pkg/analyzer/test/src/summary/elements/types_test.dart b/pkg/analyzer/test/src/summary/elements/types_test.dart index 5c9ba862ed8..da8b2dc32bc 100644 --- a/pkg/analyzer/test/src/summary/elements/types_test.dart +++ b/pkg/analyzer/test/src/summary/elements/types_test.dart @@ -502,7 +502,6 @@ library firstFragment: ::@class::C::@constructor::new methods static m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m typeParameters V @@ -664,7 +663,6 @@ library firstFragment: ::@class::C::@constructor::new methods call - reference: ::@class::C::@method::call firstFragment: ::@class::C::@method::call class D reference: ::@class::D @@ -1341,7 +1339,6 @@ library superConstructor: package:test/nullSafe.dart::::@class::NullSafeDefault::@constructor::new#element methods == - reference: ::@class::X1::@method::== firstFragment: ::@class::X1::@method::== formalParameters requiredPositional hasImplicitType other @@ -1356,7 +1353,6 @@ library superConstructor: package:test/nullSafe.dart::::@class::NullSafeObject::@constructor::new#element methods == - reference: ::@class::X2::@method::== firstFragment: ::@class::X2::@method::== formalParameters requiredPositional hasImplicitType other @@ -1371,7 +1367,6 @@ library superConstructor: package:test/nullSafe.dart::::@class::NullSafeInt::@constructor::new#element methods == - reference: ::@class::X3::@method::== firstFragment: ::@class::X3::@method::== formalParameters requiredPositional hasImplicitType other @@ -1896,7 +1891,6 @@ library firstFragment: ::@class::C::@constructor::new methods f - reference: ::@class::C::@method::f firstFragment: ::@class::C::@method::f '''); } @@ -3196,7 +3190,6 @@ library firstFragment: ::@class::C::@constructor::new methods g - reference: ::@class::C::@method::g firstFragment: ::@class::C::@method::g typeParameters V @@ -3290,7 +3283,6 @@ library firstFragment: ::@class::C::@constructor::new methods g - reference: ::@class::C::@method::g firstFragment: ::@class::C::@method::g typeParameters V diff --git a/pkg/analyzer/test/src/summary/top_level_inference_test.dart b/pkg/analyzer/test/src/summary/top_level_inference_test.dart index ccec849e0c2..27697bea4bb 100644 --- a/pkg/analyzer/test/src/summary/top_level_inference_test.dart +++ b/pkg/analyzer/test/src/summary/top_level_inference_test.dart @@ -2444,7 +2444,6 @@ library type: int methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m topLevelVariables hasInitializer vSetField @@ -5400,7 +5399,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo class B reference: ::@class::B @@ -5412,7 +5410,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods foo - reference: ::@class::B::@method::foo firstFragment: ::@class::B::@method::foo topLevelVariables hasInitializer x @@ -6555,13 +6552,11 @@ library type: int methods static staticClassMethod - reference: ::@class::A::@method::staticClassMethod firstFragment: ::@class::A::@method::staticClassMethod formalParameters requiredPositional p type: int instanceClassMethod - reference: ::@class::A::@method::instanceClassMethod firstFragment: ::@class::A::@method::instanceClassMethod formalParameters requiredPositional p @@ -9016,7 +9011,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional p @@ -17295,7 +17289,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -17310,7 +17303,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -17452,7 +17444,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -17465,7 +17456,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional a @@ -17482,7 +17472,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -17622,7 +17611,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo formalParameters requiredPositional x @@ -17635,7 +17623,6 @@ library firstFragment: ::@class::B::@constructor::new methods abstract foo - reference: ::@class::B::@method::foo firstFragment: ::@class::B::@method::foo formalParameters requiredPositional x @@ -17651,7 +17638,6 @@ library firstFragment: ::@class::C::@constructor::new methods abstract foo - reference: ::@class::C::@method::foo firstFragment: ::@class::C::@method::foo formalParameters requiredPositional hasImplicitType x @@ -17774,7 +17760,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m class B reference: ::@class::B @@ -17784,7 +17769,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m class C reference: ::@class::C @@ -17798,7 +17782,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m '''); } @@ -17953,7 +17936,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -17968,7 +17950,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional a @@ -17985,7 +17966,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -18148,7 +18128,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -18163,7 +18142,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional a @@ -18180,7 +18158,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -18290,7 +18267,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -18305,7 +18281,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -18416,7 +18391,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -18431,7 +18405,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -18537,7 +18510,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional hasImplicitType a @@ -18552,7 +18524,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -18656,7 +18627,6 @@ library firstFragment: ::@class::A::@constructor::new methods foo - reference: ::@class::A::@method::foo firstFragment: ::@class::A::@method::foo formalParameters requiredPositional a @@ -18671,7 +18641,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -18818,7 +18787,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -18968,7 +18936,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -18993,7 +18960,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -19133,7 +19099,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19148,7 +19113,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -19163,7 +19127,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -19302,7 +19265,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19317,7 +19279,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -19332,7 +19293,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -19472,7 +19432,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19488,7 +19447,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -19503,7 +19461,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -19632,7 +19589,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19649,7 +19605,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -19755,7 +19710,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19770,7 +19724,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -19886,7 +19839,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -19904,7 +19856,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -20019,7 +19970,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20036,7 +19986,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -20188,7 +20137,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20213,7 +20161,6 @@ library superConstructor: ::@class::B::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -20329,7 +20276,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20344,7 +20290,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -20447,7 +20392,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20462,7 +20406,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -20611,7 +20554,6 @@ library firstFragment: ::@class::A::@constructor::new methods abstract m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20637,7 +20579,6 @@ library firstFragment: ::@class::C::@constructor::new methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -20739,7 +20680,6 @@ library firstFragment: ::@class::A1::@constructor::new methods _foo - reference: ::@class::A1::@method::_foo firstFragment: ::@class::A1::@method::_foo class A2 reference: ::@class::A2 @@ -20751,7 +20691,6 @@ library superConstructor: ::@class::A1::@constructor::new#element methods _foo - reference: ::@class::A2::@method::_foo firstFragment: ::@class::A2::@method::_foo '''); } @@ -20852,7 +20791,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -20868,7 +20806,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional hasImplicitType a @@ -21030,7 +20967,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -21045,7 +20981,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional a @@ -21062,7 +20997,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a @@ -21201,7 +21135,6 @@ library firstFragment: ::@class::A::@constructor::new methods m - reference: ::@class::A::@method::m firstFragment: ::@class::A::@method::m formalParameters requiredPositional a @@ -21214,7 +21147,6 @@ library firstFragment: ::@class::B::@constructor::new methods m - reference: ::@class::B::@method::m firstFragment: ::@class::B::@method::m formalParameters requiredPositional a @@ -21231,7 +21163,6 @@ library superConstructor: ::@class::A::@constructor::new#element methods m - reference: ::@class::C::@method::m firstFragment: ::@class::C::@method::m formalParameters requiredPositional hasImplicitType a diff --git a/pkg/linter/test/rules/annotate_redeclares_test.dart b/pkg/linter/test/rules/annotate_redeclares_test.dart index 370639fe3fa..461a664ce5d 100644 --- a/pkg/linter/test/rules/annotate_redeclares_test.dart +++ b/pkg/linter/test/rules/annotate_redeclares_test.dart @@ -41,6 +41,7 @@ extension type E(A a) implements A { ); } + @SkippedTest() // TODO(scheglov): implement augmentation test_augmentationMethodWithAnnotation() async { newFile('$testPackageLibPath/a.dart', r''' part 'test.dart'; diff --git a/pkg/linter/test/rules/avoid_classes_with_only_static_members_test.dart b/pkg/linter/test/rules/avoid_classes_with_only_static_members_test.dart index 34234f18906..0918200112b 100644 --- a/pkg/linter/test/rules/avoid_classes_with_only_static_members_test.dart +++ b/pkg/linter/test/rules/avoid_classes_with_only_static_members_test.dart @@ -59,6 +59,7 @@ augment class A { await assertNoDiagnosticsInFile(b.path); } + @SkippedTest() // TODO(scheglov): implement augmentation test_augmentationClass_staticMethod() async { var a = newFile('$testPackageLibPath/a.dart', r''' part 'b.dart'; diff --git a/pkg/linter/test/rules/one_member_abstracts_test.dart b/pkg/linter/test/rules/one_member_abstracts_test.dart index fac86f12c7a..148e3bf4dba 100644 --- a/pkg/linter/test/rules/one_member_abstracts_test.dart +++ b/pkg/linter/test/rules/one_member_abstracts_test.dart @@ -64,6 +64,7 @@ augment abstract class A { '''); } + @SkippedTest() // TODO(scheglov): implement augmentation test_oneMember_augmentedAbstractClass_declaration() async { newFile('$testPackageLibPath/a.dart', r''' part of 'test.dart';