languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 13:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate xyz2 in elements.

Browse source 
Change-Id: I0dbf25882cf66670ce2d69dd22aceb053be9feb7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/265182
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov 2022-10-21 22:07:47 +00:00 committed by Commit Queue
parent 7840c54107
commit 664c021374
43 changed files with 355 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
View file

@ -21,10 +21,10 @@ class ImplementedComputer {
for (var element in unitElement.classes) {
await _computeForClassElement(element);
}
for (var element in unitElement.enums2) {
for (var element in unitElement.enums) {
await _computeForClassElement(element);
}
for (var element in unitElement.mixins2) {
for (var element in unitElement.mixins) {
await _computeForClassElement(element);
}
}

2
pkg/analysis_server/lib/src/search/type_hierarchy.dart
View file

@ -196,7 +196,7 @@ class TypeHierarchyComputer {
result = clazz.getSetter(pivotName);
}
}
if (result != null && result.isAccessibleIn2(_pivotLibrary)) {
if (result != null && result.isAccessibleIn(_pivotLibrary)) {
return result;
}
// try to find in the class mixin

4
pkg/analysis_server/lib/src/services/completion/dart/redirecting_contributor.dart
View file

@ -38,7 +38,7 @@ class RedirectingContributor extends DartCompletionContributor {
parent.enclosingInterfaceElement?.supertype?.element;
if (superclassElement != null) {
for (var constructor in superclassElement.constructors) {
if (constructor.isAccessibleIn2(request.libraryElement)) {
if (constructor.isAccessibleIn(request.libraryElement)) {
builder.suggestConstructor(constructor, hasClassName: true);
}
}
@ -64,7 +64,7 @@ class RedirectingContributor extends DartCompletionContributor {
class_.thisType, classElement.thisType)) {
for (var constructor in class_.constructors) {
if (constructor != constructorElement &&
constructor.isAccessibleIn2(request.libraryElement)) {
constructor.isAccessibleIn(request.libraryElement)) {
builder.suggestConstructor(constructor);
}
}

2
pkg/analysis_server/lib/src/services/completion/dart/static_member_contributor.dart
View file

@ -19,7 +19,7 @@ class StaticMemberContributor extends DartCompletionContributor {
@override
Future<void> computeSuggestions() async {
var library = request.libraryElement;
bool isVisible(Element element) => element.isAccessibleIn2(library);
bool isVisible(Element element) => element.isAccessibleIn(library);
var targetId = request.target.dotTarget;
if (targetId is Identifier && !request.target.isCascade) {
var element = targetId.staticElement;

4
pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
View file

@ -89,7 +89,7 @@ class MemberSuggestionBuilder {
void addSuggestionForAccessor(
{required PropertyAccessorElement accessor,
required double inheritanceDistance}) {
if (accessor.isAccessibleIn2(request.libraryElement)) {
if (accessor.isAccessibleIn(request.libraryElement)) {
var member = accessor.isSynthetic ? accessor.variable : accessor;
if (_shouldAddSuggestion(member)) {
builder.suggestAccessor(accessor,
@ -103,7 +103,7 @@ class MemberSuggestionBuilder {
{required MethodElement method,
required CompletionSuggestionKind kind,
required double inheritanceDistance}) {
if (method.isAccessibleIn2(request.libraryElement) &&
if (method.isAccessibleIn(request.libraryElement) &&
_shouldAddSuggestion(method)) {
builder.suggestMethod(method,
kind: kind, inheritanceDistance: inheritanceDistance);

2
pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
View file

@ -123,7 +123,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
continue;
}
// check the element being renamed is accessible
if (!element.isAccessibleIn2(reference.libraryElement)) {
if (!element.isAccessibleIn(reference.libraryElement)) {
continue;
}
// add edit

6
pkg/analyzer/CHANGELOG.md
View file

@ -4,6 +4,12 @@
* Deprecated `CatchClause.exceptionParameter2`, use `exceptionParameter` instead.
* Deprecated `CatchClause.stackTraceParameter2`, use `stackTraceParameter` instead.
* Deprecated `DartType.element2`, use `element` instead.
* Deprecated `Element.isAccessibleIn2()`, use `isAccessibleIn()` instead.
* Deprecated `CompilationUnitElement.enums2`, use `enums` instead.
* Deprecated `CompilationUnitElement.getEnum2()`, use `getEnum()` instead.
* Deprecated `CompilationUnitElement.mixins2`, use `mixins` instead.
* Deprecated `LibraryElement.parts2`, use `parts` instead.
* Deprecated `ImportElement.imports2`, use `imports` instead.
## 5.1.0
* Deprecated `AstNode.name2`, use `name` instead.

34
pkg/analyzer/lib/dart/element/element.dart
View file

@ -288,6 +288,11 @@ abstract class CompilationUnitElement implements UriReferencedElement {
/// Return a list containing all of the enums contained in this compilation
/// unit.
List<EnumElement> get enums;
/// Return a list containing all of the enums contained in this compilation
/// unit.
@Deprecated('Use enum instead')
List<EnumElement> get enums2;
/// Return a list containing all of the extensions contained in this
@ -303,6 +308,11 @@ abstract class CompilationUnitElement implements UriReferencedElement {
/// Return a list containing all of the mixins contained in this compilation
/// unit.
List<MixinElement> get mixins;
/// Return a list containing all of the mixins contained in this compilation
/// unit.
@Deprecated('Use mixins instead')
List<MixinElement> get mixins2;
@override
@ -324,6 +334,12 @@ abstract class CompilationUnitElement implements UriReferencedElement {
/// Return the enum defined in this compilation unit that has the given
/// [name], or `null` if this compilation unit does not define an enum with
/// the given name.
EnumElement? getEnum(String name);
/// Return the enum defined in this compilation unit that has the given
/// [name], or `null` if this compilation unit does not define an enum with
/// the given name.
@Deprecated('Use getEnum() instead')
EnumElement? getEnum2(String name);
}
@ -695,6 +711,16 @@ abstract class Element implements AnalysisTarget {
/// A declaration <i>m</i> is accessible to a library <i>L</i> if <i>m</i> is
/// declared in <i>L</i> or if <i>m</i> is public.
/// </blockquote>
bool isAccessibleIn(LibraryElement library);
/// Return `true` if this element, assuming that it is within scope, is
/// accessible to code in the given [library]. This is defined by the Dart
/// Language Specification in section 6.2:
/// <blockquote>
/// A declaration <i>m</i> is accessible to a library <i>L</i> if <i>m</i> is
/// declared in <i>L</i> or if <i>m</i> is public.
/// </blockquote>
@Deprecated('Use isAccessibleIn() instead')
bool isAccessibleIn2(LibraryElement library);
/// Return either this element or the most immediate ancestor of this element
@ -1673,6 +1699,10 @@ abstract class LibraryElement
String get name;
/// Returns the list of `part` directives of this library.
List<PartElement> get parts;
/// Returns the list of `part` directives of this library.
@Deprecated('Use parts instead')
List<PartElement> get parts2;
/// The public [Namespace] of this library.
@ -2053,6 +2083,10 @@ abstract class PrefixElement implements _ExistingElement {
LibraryOrAugmentationElement get enclosingElement3;
/// Return the imports that share this prefix.
List<LibraryImportElement> get imports;
/// Return the imports that share this prefix.
@Deprecated('Use imports instead')
List<LibraryImportElement> get imports2;
@override

144
pkg/analyzer/lib/fix_data.yaml Normal file
View file

@ -0,0 +1,144 @@
version: 1
transforms:
# CompilationUnitElement
- title: "Replace with get enums"
date: 2022-10-21
element:
getter: 'enums2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'CompilationUnitElement'
changes:
- kind: 'rename'
newName: 'enums'
- title: "Replace with get enums"
date: 2022-10-21
element:
getter: 'enums2'
uris: [ 'package:analyzer/src/dart/element/element.dart' ]
inClass: 'CompilationUnitElementImpl'
changes:
- kind: 'rename'
newName: 'enums'
- title: "Replace with get mixins"
date: 2022-10-21
element:
getter: 'mixins2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'CompilationUnitElement'
changes:
- kind: 'rename'
newName: 'mixins'
- title: "Replace with get mixins"
date: 2022-10-21
element:
getter: 'mixins2'
uris: [ 'package:analyzer/src/dart/element/element.dart' ]
inClass: 'CompilationUnitElementImpl'
changes:
- kind: 'rename'
newName: 'mixins'
- title: "Replace with getEnum()"
date: 2022-10-21
element:
method: 'getEnum2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'CompilationUnitElement'
changes:
- kind: 'rename'
newName: 'getEnum'
# LibraryElement
- title: "Replace with get parts"
date: 2022-10-21
element:
getter: 'parts2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'LibraryElement'
changes:
- kind: 'rename'
newName: 'parts'
- title: "Replace with get parts"
date: 2022-10-21
element:
getter: 'parts2'
uris: [ 'package:analyzer/src/dart/element/element.dart' ]
inClass: 'LibraryElementImpl'
changes:
- kind: 'rename'
newName: 'parts'
# PrefixElement
- title: "Replace with get imports"
date: 2022-10-21
element:
getter: 'imports2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'PrefixElement'
changes:
- kind: 'rename'
newName: 'imports'
# isAccessibleIn
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'Element'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'ClassElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'ConstructorElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'ExecutableElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'MethodElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'InterfaceElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'
- title: "Replace with get isAccessibleIn"
date: 2022-10-21
element:
method: 'isAccessibleIn2'
uris: [ 'package:analyzer/dart/element/element.dart' ]
inClass: 'PropertyAccessorElement'
changes:
- kind: 'rename'
newName: 'isAccessibleIn'

2
pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
View file

@ -713,7 +713,7 @@ class LibraryAnalyzer {
_resolvePartDirective(
directive: directive,
partState: containerKind.parts[index],
partElement: containerElement.parts2[index],
partElement: containerElement.parts[index],
errorReporter: containerErrorReporter,
libraryNameNode: libraryNameNode,
units: units,

12
pkg/analyzer/lib/src/dart/analysis/search.dart
View file

@ -256,8 +256,8 @@ class Search {
var unitResult = await _driver.getUnitElement(file);
if (unitResult is UnitElementResult) {
unitResult.element.classes.forEach(addElements);
unitResult.element.enums2.forEach(addElements);
unitResult.element.mixins2.forEach(addElements);
unitResult.element.enums.forEach(addElements);
unitResult.element.mixins.forEach(addElements);
}
}
}
@ -380,10 +380,10 @@ class Search {
CompilationUnitElement unitElement = unitResult.element;
unitElement.accessors.forEach(addElement);
unitElement.classes.forEach(addElement);
unitElement.enums2.forEach(addElement);
unitElement.enums.forEach(addElement);
unitElement.extensions.forEach(addElement);
unitElement.functions.forEach(addElement);
unitElement.mixins2.forEach(addElement);
unitElement.mixins.forEach(addElement);
unitElement.topLevelVariables.forEach(addElement);
unitElement.typeAliases.forEach(addElement);
}
@ -893,8 +893,8 @@ class _FindCompilationUnitDeclarations {
_addAccessors(unit.accessors);
_addClasses(unit.classes);
_addClasses(unit.enums2);
_addClasses(unit.mixins2);
_addClasses(unit.enums);
_addClasses(unit.mixins);
_addExtensions(unit.extensions);
_addFunctions(unit.functions);
_addTypeAliases(unit.typeAliases);

2
pkg/analyzer/lib/src/dart/ast/ast.dart
View file

@ -10146,7 +10146,7 @@ class PrefixedIdentifierImpl extends IdentifierImpl
bool get isDeferred {
Element? element = _prefix.staticElement;
if (element is PrefixElement) {
final imports = element.imports2;
final imports = element.imports;
if (imports.length != 1) {
return false;
}

108
pkg/analyzer/lib/src/dart/element/element.dart
View file

@ -291,13 +291,13 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
String methodName, LibraryElement library) =>
_first(_implementationsOfMethod(methodName).where(
(MethodElement method) =>
!method.isAbstract && method.isAccessibleIn2(library)));
!method.isAbstract && method.isAccessibleIn(library)));
@override
PropertyAccessorElement? lookUpGetter(
String getterName, LibraryElement library) =>
_first(_implementationsOfGetter(getterName).where(
(PropertyAccessorElement getter) => getter.isAccessibleIn2(library)));
(PropertyAccessorElement getter) => getter.isAccessibleIn(library)));
@override
PropertyAccessorElement? lookUpInheritedConcreteGetter(
@ -306,7 +306,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
(PropertyAccessorElement getter) =>
!getter.isAbstract &&
!getter.isStatic &&
getter.isAccessibleIn2(library) &&
getter.isAccessibleIn(library) &&
getter.enclosingElement != this));
ExecutableElement? lookUpInheritedConcreteMember(
@ -326,7 +326,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
(MethodElement method) =>
!method.isAbstract &&
!method.isStatic &&
method.isAccessibleIn2(library) &&
method.isAccessibleIn(library) &&
method.enclosingElement != this));
@override
@ -336,7 +336,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
(PropertyAccessorElement setter) =>
!setter.isAbstract &&
!setter.isStatic &&
setter.isAccessibleIn2(library) &&
setter.isAccessibleIn(library) &&
setter.enclosingElement != this));
@override
@ -345,19 +345,19 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
_first(_implementationsOfMethod(methodName).where(
(MethodElement method) =>
!method.isStatic &&
method.isAccessibleIn2(library) &&
method.isAccessibleIn(library) &&
method.enclosingElement != this));
@override
MethodElement? lookUpMethod(String methodName, LibraryElement library) =>
_first(_implementationsOfMethod(methodName)
.where((MethodElement method) => method.isAccessibleIn2(library)));
.where((MethodElement method) => method.isAccessibleIn(library)));
@override
PropertyAccessorElement? lookUpSetter(
String setterName, LibraryElement library) =>
_first(_implementationsOfSetter(setterName).where(
(PropertyAccessorElement setter) => setter.isAccessibleIn2(library)));
(PropertyAccessorElement setter) => setter.isAccessibleIn(library)));
/// Return the static getter with the [name], accessible to the [library].
///
@ -367,7 +367,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
PropertyAccessorElement? lookupStaticGetter(
String name, LibraryElement library) {
return _first(_implementationsOfGetter(name).where((element) {
return element.isStatic && element.isAccessibleIn2(library);
return element.isStatic && element.isAccessibleIn(library);
}));
}
@ -378,7 +378,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
/// or a superclass.
MethodElement? lookupStaticMethod(String name, LibraryElement library) {
return _first(_implementationsOfMethod(name).where((element) {
return element.isStatic && element.isAccessibleIn2(library);
return element.isStatic && element.isAccessibleIn(library);
}));
}
@ -390,7 +390,7 @@ abstract class AbstractClassElementImpl extends _ExistingElementImpl
PropertyAccessorElement? lookupStaticSetter(
String name, LibraryElement library) {
return _first(_implementationsOfSetter(name).where((element) {
return element.isStatic && element.isAccessibleIn2(library);
return element.isStatic && element.isAccessibleIn(library);
}));
}
@ -796,7 +796,7 @@ class ClassElementImpl extends ClassOrMixinElementImpl implements ClassElement {
if (!superElement.isMixinApplication) {
final library = this.library;
constructorsToForward = superElement.constructors
.where((constructor) => constructor.isAccessibleIn2(library))
.where((constructor) => constructor.isAccessibleIn(library))
.where((constructor) => !constructor.isFactory);
} else {
if (visitedClasses == null) {
@ -1131,10 +1131,10 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
...super.children,
...accessors,
...classes,
...enums2,
...enums,
...extensions,
...functions,
...mixins2,
...mixins,
...typeAliases,
...topLevelVariables,
];
@ -1172,18 +1172,24 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
}
@override
List<EnumElement> get enums2 {
List<EnumElement> get enums {
return _enums;
}
/// Set the enums contained in this compilation unit to the given [enums].
set enums2(List<EnumElement> enums) {
set enums(List<EnumElement> enums) {
for (final element in enums) {
(element as EnumElementImpl).enclosingElement = this;
}
_enums = enums;
}
@Deprecated('Use enums instead')
@override
List<EnumElement> get enums2 {
return enums;
}
@override
List<ExtensionElement> get extensions {
return _extensions;
@ -1228,18 +1234,24 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
}
@override
List<MixinElement> get mixins2 {
List<MixinElement> get mixins {
return _mixins;
}
/// Set the mixins contained in this compilation unit to the given [mixins].
set mixins2(List<MixinElement> mixins) {
set mixins(List<MixinElement> mixins) {
for (var type in mixins) {
(type as MixinElementImpl).enclosingElement = this;
}
_mixins = mixins;
}
@Deprecated('Use mixins instead')
@override
List<MixinElement> get mixins2 {
return mixins;
}
@override
AnalysisSession get session => enclosingElement.session;
@ -1297,8 +1309,8 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
}
@override
EnumElement? getEnum2(String name) {
for (final element in enums2) {
EnumElement? getEnum(String name) {
for (final element in enums) {
if (element.name == name) {
return element;
}
@ -1306,6 +1318,12 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
return null;
}
@Deprecated('Use getEnum() instead')
@override
EnumElement? getEnum2(String name) {
return getEnum(name);
}
void setLinkedData(Reference reference, ElementLinkedData linkedData) {
this.reference = reference;
reference.element = this;
@ -2667,13 +2685,19 @@ abstract class ElementImpl implements Element {
BooleanArray.get(_modifiers, modifier.ordinal);
@override
bool isAccessibleIn2(LibraryElement library) {
bool isAccessibleIn(LibraryElement library) {
if (Identifier.isPrivateName(name!)) {
return library == this.library;
}
return true;
}
@Deprecated('Use isAccessibleIn() instead')
@override
bool isAccessibleIn2(LibraryElement library) {
return isAccessibleIn(library);
}
void resetMetadataFlags() {
_metadataFlags = 0;
}
@ -3854,7 +3878,7 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
FunctionElement? _entryPoint;
/// The list of `part` directives of this library.
List<PartElement> _parts2 = const <PartElement>[];
List<PartElement> _parts = const <PartElement>[];
/// The element representing the synthetic function `loadLibrary` that is
/// defined for this library, or `null` if the element has not yet been
@ -3898,7 +3922,7 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
@override
List<Element> get children => [
...super.children,
...parts2,
...parts,
..._partUnits,
];
@ -4061,9 +4085,9 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
String get name => super.name!;
@override
List<PartElement> get parts2 => _parts2;
List<PartElement> get parts => _parts;
set parts2(List<PartElement> parts) {
set parts(List<PartElement> parts) {
for (final part in parts) {
part as PartElementImpl;
part.enclosingElement = this;
@ -4072,9 +4096,13 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
uri.unit.enclosingElement = this;
}
}
_parts2 = parts;
_parts = parts;
}
@Deprecated('Use parts instead')
@override
List<PartElement> get parts2 => parts;
@override
List<PrefixElement> get prefixes =>
_prefixes ??= buildPrefixesFromImports(libraryImports);
@ -4099,10 +4127,10 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
for (var unit in units) {
yield* unit.accessors;
yield* unit.classes;
yield* unit.enums2;
yield* unit.enums;
yield* unit.extensions;
yield* unit.functions;
yield* unit.mixins2;
yield* unit.mixins;
yield* unit.topLevelVariables;
yield* unit.typeAliases;
}
@ -4118,7 +4146,7 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
}
List<CompilationUnitElement> get _partUnits {
return parts2
return parts
.map((e) => e.uri)
.whereType<DirectiveUriWithUnit>()
.map((e) => e.unit)
@ -4151,7 +4179,7 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
EnumElement? getEnum(String name) {
for (final unitElement in units) {
final element = unitElement.getEnum2(name);
final element = unitElement.getEnum(name);
if (element != null) {
return element;
}
@ -4199,7 +4227,7 @@ class LibraryElementImpl extends LibraryOrAugmentationElementImpl
return true;
}
}
for (var partElement in parts2) {
for (var partElement in parts) {
final uri = partElement.uri;
if (uri is DirectiveUriWithSource &&
uri is! DirectiveUriWithUnit &&
@ -5036,15 +5064,21 @@ class MultiplyDefinedElementImpl implements MultiplyDefinedElement {
}
@override
bool isAccessibleIn2(LibraryElement library) {
bool isAccessibleIn(LibraryElement library) {
for (Element element in conflictingElements) {
if (element.isAccessibleIn2(library)) {
if (element.isAccessibleIn(library)) {
return true;
}
}
return false;
}
@Deprecated('Use isAccessibleIn() instead')
@override
bool isAccessibleIn2(LibraryElement library) {
return isAccessibleIn(library);
}
@override
E? thisOrAncestorMatching<E extends Element>(
bool Function(Element) predicate,
@ -5436,12 +5470,18 @@ class PrefixElementImpl extends _ExistingElementImpl implements PrefixElement {
LibraryOrAugmentationElementImpl get enclosingElement3 => enclosingElement;
@override
List<LibraryImportElement> get imports2 {
List<LibraryImportElement> get imports {
return enclosingElement.libraryImports
.where((import) => import.prefix?.element == this)
.toList();
}
@Deprecated('Use imports instead')
@override
List<LibraryImportElement> get imports2 {
return imports;
}
@override
ElementKind get kind => ElementKind.PREFIX;

8
pkg/analyzer/lib/src/dart/element/member.dart
View file

@ -645,8 +645,12 @@ abstract class Member implements Element {
_declaration.getExtendedDisplayName(shortName);
@override
bool isAccessibleIn2(LibraryElement library) =>
_declaration.isAccessibleIn2(library);
bool isAccessibleIn(LibraryElement library) =>
_declaration.isAccessibleIn(library);
@Deprecated('Use isAccessibleIn() instead')
@override
bool isAccessibleIn2(LibraryElement library) => isAccessibleIn(library);
@override
E? thisOrAncestorMatching<E extends Element>(

4
pkg/analyzer/lib/src/dart/element/scope.dart
View file

@ -126,11 +126,11 @@ class LibraryOrAugmentationScope extends EnclosedScope {
void _addUnitElements(CompilationUnitElement compilationUnit) {
compilationUnit.accessors.forEach(_addPropertyAccessor);
compilationUnit.enums2.forEach(_addGetter);
compilationUnit.enums.forEach(_addGetter);
compilationUnit.extensions.forEach(_addExtension);
compilationUnit.functions.forEach(_addGetter);
compilationUnit.typeAliases.forEach(_addGetter);
compilationUnit.mixins2.forEach(_addGetter);
compilationUnit.mixins.forEach(_addGetter);
compilationUnit.classes.forEach(_addGetter);
}
}

2
pkg/analyzer/lib/src/dart/element/type.dart
View file

@ -735,7 +735,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
}
// not found or not accessible
if (constructorElement == null ||
!constructorElement.isAccessibleIn2(library)) {
!constructorElement.isAccessibleIn(library)) {
return null;
}
// return member

2
pkg/analyzer/lib/src/dart/resolver/function_reference_resolver.dart
View file

@ -784,7 +784,7 @@ class FunctionReferenceResolver {
}
element ??= classElement.getGetter(name);
element ??= classElement.getMethod(name);
if (element != null && element.isAccessibleIn2(_resolver.definingLibrary)) {
if (element != null && element.isAccessibleIn(_resolver.definingLibrary)) {
return element;
}
return null;

3
pkg/analyzer/lib/src/dart/resolver/invocation_inference_helper.dart
View file

@ -95,8 +95,7 @@ class InvocationInferenceHelper {
} else {
var name = constructorIdentifier.name;
rawElement = typeElement.getNamedConstructor(name);
if (rawElement != null &&
!rawElement.isAccessibleIn2(definingLibrary)) {
if (rawElement != null && !rawElement.isAccessibleIn(definingLibrary)) {
rawElement = null;
}
}

4
pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart
View file

@ -347,7 +347,7 @@ class MethodInvocationResolver with ScopeHelpers {
}
element ??= classElement.getGetter(name);
element ??= classElement.getMethod(name);
if (element != null && element.isAccessibleIn2(_definingLibrary)) {
if (element != null && element.isAccessibleIn(_definingLibrary)) {
return element;
}
return null;
@ -626,7 +626,7 @@ class MethodInvocationResolver with ScopeHelpers {
// Note: prefix?.bar is reported as an error in ElementResolver.
if (name == FunctionElement.LOAD_LIBRARY_NAME) {
var imports = prefix.imports2;
var imports = prefix.imports;
if (imports.length == 1 &&
imports[0].prefix is DeferredImportElementPrefix) {
var importedLibrary = imports[0].importedLibrary;

2
pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart
View file

@ -346,7 +346,7 @@ class PropertyElementResolver with ScopeHelpers {
}
bool _isAccessible(ExecutableElement element) {
return element.isAccessibleIn2(_definingLibrary);
return element.isAccessibleIn(_definingLibrary);
}
void _reportUnresolvedIndex(

4
pkg/analyzer/lib/src/dart/resolver/scope.dart
View file

@ -211,7 +211,7 @@ class NamespaceBuilder {
for (ClassElement element in compilationUnit.classes) {
_addIfPublic(definedNames, element);
}
for (final element in compilationUnit.enums2) {
for (final element in compilationUnit.enums) {
_addIfPublic(definedNames, element);
}
for (ExtensionElement element in compilationUnit.extensions) {
@ -220,7 +220,7 @@ class NamespaceBuilder {
for (FunctionElement element in compilationUnit.functions) {
_addIfPublic(definedNames, element);
}
for (final element in compilationUnit.mixins2) {
for (final element in compilationUnit.mixins) {
_addIfPublic(definedNames, element);
}
for (TypeAliasElement element in compilationUnit.typeAliases) {

2
pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart
View file

@ -319,7 +319,7 @@ class DuplicateDefinitionVerifier {
for (ClassElement class_ in element.classes) {
definedGetters[class_.name] = class_;
}
for (final type in element.enums2) {
for (final type in element.enums) {
definedGetters[type.name] = type;
}
for (FunctionElement function in element.functions) {

2
pkg/analyzer/lib/src/generated/element_resolver.dart
View file

@ -361,7 +361,7 @@ class ElementResolver {
var superName = name?.name;
var element = superType.lookUpConstructor(superName, _definingLibrary);
element = _resolver.toLegacyElement(element);
if (element == null || !element.isAccessibleIn2(_definingLibrary)) {
if (element == null || !element.isAccessibleIn(_definingLibrary)) {
if (name != null) {
_errorReporter.reportErrorForNode(
CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER,

4
pkg/analyzer/lib/src/generated/element_walker.dart
View file

@ -53,10 +53,10 @@ class ElementWalker {
{this.libraryFilePath, this.unitFilePath})
: _accessors = element.accessors.where(_isNotSynthetic).toList(),
_classes = element.classes,
_enums = element.enums2,
_enums = element.enums,
_extensions = element.extensions,
_functions = element.functions,
_mixins = element.mixins2,
_mixins = element.mixins,
_typedefs = element.typeAliases,
_variables = element.topLevelVariables.where(_isNotSynthetic).toList();

8
pkg/analyzer/lib/src/summary2/bundle_reader.dart
View file

@ -402,7 +402,7 @@ class LibraryElementLinkedData extends ElementLinkedData<LibraryElementImpl> {
@override
void _read(element, reader) {
_readLibraryOrAugmentation(element, reader);
for (final part in element.parts2) {
for (final part in element.parts) {
part as PartElementImpl;
part.metadata = reader._readAnnotationList(
unitElement: unitElement,
@ -516,7 +516,7 @@ class LibraryReader {
unitContainerRef: _reference.getChild('@unit'),
);
libraryElement.parts2 = _reader.readTypedList(() {
libraryElement.parts = _reader.readTypedList(() {
return _readPartElement(
libraryElement: libraryElement,
);
@ -802,7 +802,7 @@ class LibraryReader {
Reference unitReference,
) {
var count = _reader.readUInt30();
unitElement.enums2 = List.generate(count, (_) {
unitElement.enums = List.generate(count, (_) {
return _readEnumElement(unitElement, unitReference);
});
}
@ -1147,7 +1147,7 @@ class LibraryReader {
Reference unitReference,
) {
var length = _reader.readUInt30();
unitElement.mixins2 = List.generate(length, (index) {
unitElement.mixins = List.generate(length, (index) {
return _readMixinElement(unitElement, unitReference);
});
}

8
pkg/analyzer/lib/src/summary2/bundle_writer.dart
View file

@ -103,13 +103,13 @@ class BundleWriter {
_writeFeatureSet(libraryElement.featureSet);
_writeLanguageVersion(libraryElement.languageVersion);
_writeLibraryOrAugmentationElement(libraryElement);
for (final partElement in libraryElement.parts2) {
for (final partElement in libraryElement.parts) {
_resolutionSink._writeAnnotationList(partElement.metadata);
}
_resolutionSink.writeElement(libraryElement.entryPoint);
LibraryElementFlags.write(_sink, libraryElement);
_writeUnitElement(libraryElement.definingCompilationUnit);
_writeList(libraryElement.parts2, _writePartElement);
_writeList(libraryElement.parts, _writePartElement);
_writeExportedReferences(libraryElement.exportedReferences);
@ -546,10 +546,10 @@ class BundleWriter {
_sink._writeOptionalStringReference(unitElement.uri);
_sink.writeBool(unitElement.isSynthetic);
_writeList(unitElement.classes, _writeClassElement);
_writeList(unitElement.enums2, _writeEnumElement);
_writeList(unitElement.enums, _writeEnumElement);
_writeList(unitElement.extensions, _writeExtensionElement);
_writeList(unitElement.functions, _writeFunctionElement);
_writeList(unitElement.mixins2, _writeMixinElement);
_writeList(unitElement.mixins, _writeMixinElement);
_writeList(unitElement.typeAliases, _writeTypeAliasElement);
_writeList(

4
pkg/analyzer/lib/src/summary2/constructor_initializer_resolver.dart
View file

@ -20,8 +20,8 @@ class ConstructorInitializerResolver {
for (var unitElement in _libraryElement.units) {
var interfaceElements = [
...unitElement.classes,
...unitElement.enums2,
...unitElement.mixins2,
...unitElement.enums,
...unitElement.mixins,
];
for (var interfaceElement in interfaceElements) {
for (var constructorElement in interfaceElement.constructors) {

4
pkg/analyzer/lib/src/summary2/default_value_resolver.dart
View file

@ -23,10 +23,10 @@ class DefaultValueResolver {
for (var unitElement in _libraryElement.units.impl) {
_UnitContext(unitElement)
..forEach(unitElement.classes, _class)
..forEach(unitElement.enums2, _class)
..forEach(unitElement.enums, _class)
..forEach(unitElement.extensions, _extension)
..forEach(unitElement.functions, _executable)
..forEach(unitElement.mixins2, _class);
..forEach(unitElement.mixins, _class);
}
}

6
pkg/analyzer/lib/src/summary2/element_builder.dart
View file

@ -50,10 +50,10 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
_visitPropertyFirst<TopLevelVariableDeclaration>(unit.declarations);
_unitElement.accessors = _enclosingContext.propertyAccessors;
_unitElement.classes = _enclosingContext.classes;
_unitElement.enums2 = _enclosingContext.enums;
_unitElement.enums = _enclosingContext.enums;
_unitElement.extensions = _enclosingContext.extensions;
_unitElement.functions = _enclosingContext.functions;
_unitElement.mixins2 = _enclosingContext.mixins;
_unitElement.mixins = _enclosingContext.mixins;
_unitElement.topLevelVariables = _enclosingContext.properties
.whereType<TopLevelVariableElementImpl>()
.toList();
@ -895,7 +895,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
final libraryElement = _container;
if (libraryElement is LibraryElementImpl) {
final index = _partDirectiveIndex++;
final partElement = libraryElement.parts2[index];
final partElement = libraryElement.parts[index];
partElement as PartElementImpl;
partElement.metadata = _buildAnnotations(node.metadata);
}

8
pkg/analyzer/lib/src/summary2/informative_data.dart
View file

@ -109,7 +109,7 @@ class InformativeDataApplier {
);
forCorrespondingPairs(
unitElement.enums2, unitInfo.enums, _applyToEnumDeclaration);
unitElement.enums, unitInfo.enums, _applyToEnumDeclaration);
forCorrespondingPairs(unitElement.extensions, unitInfo.extensions,
_applyToExtensionDeclaration);
@ -117,7 +117,7 @@ class InformativeDataApplier {
forCorrespondingPairs(unitElement.functions, unitInfo.functions,
_applyToFunctionDeclaration);
forCorrespondingPairs(unitElement.mixins2, unitInfo.mixinDeclarations,
forCorrespondingPairs(unitElement.mixins, unitInfo.mixinDeclarations,
_applyToMixinDeclaration);
forCorrespondingPairs(unitElement.topLevelVariables,
@ -518,7 +518,7 @@ class InformativeDataApplier {
_applyToExports(element, info);
forCorrespondingPairs<PartElement, _InfoPart>(
element.parts2,
element.parts,
info.parts,
(element, info) {
element as PartElementImpl;
@ -533,7 +533,7 @@ class InformativeDataApplier {
applier.applyToImports(element.libraryImports);
applier.applyToExports(element.libraryExports);
applier.applyToAugmentationImports(element.augmentationImports);
applier.applyToPartDirectives(element.parts2);
applier.applyToPartDirectives(element.parts);
},
);
}

4
pkg/analyzer/lib/src/summary2/library_builder.dart
View file

@ -354,7 +354,7 @@ class LibraryBuilder {
var unitReference = reference.getChild('@unit').getChild('$unitUri');
_bindReference(unitReference, unitElement);
element.parts2.add(
element.parts.add(
PartElementImpl(
uri: DirectiveUriWithUnitImpl(
relativeUriString: '_macro_types.dart',
@ -879,7 +879,7 @@ class LibraryBuilder {
);
}
libraryElement.parts2 = parts;
libraryElement.parts = parts;
final builder = LibraryBuilder._(
linker: linker,

4
pkg/analyzer/lib/src/summary2/simply_bounded.dart
View file

@ -22,11 +22,11 @@ void computeSimplyBounded(Linker linker) {
var node = walker.getNode(element);
nodes.add(node);
}
for (var element in unit.enums2) {
for (var element in unit.enums) {
var node = walker.getNode(element);
nodes.add(node);
}
for (var element in unit.mixins2) {
for (var element in unit.mixins) {
var node = walker.getNode(element);
nodes.add(node);
}

12
pkg/analyzer/lib/src/summary2/top_level_inference.dart
View file

@ -43,9 +43,9 @@ class ConstantInitializersResolver {
for (var unit in _library.units) {
_unitElement = unit as CompilationUnitElementImpl;
unit.classes.forEach(_resolveInterfaceFields);
unit.enums2.forEach(_resolveInterfaceFields);
unit.enums.forEach(_resolveInterfaceFields);
unit.extensions.forEach(_resolveExtensionFields);
unit.mixins2.forEach(_resolveInterfaceFields);
unit.mixins.forEach(_resolveInterfaceFields);
_scope = unit.enclosingElement.scope;
unit.topLevelVariables.forEach(_resolveVariable);
@ -180,7 +180,7 @@ class _ConstructorInferenceNode extends _InferenceNode {
if (superType != null) {
var index = classElement.constructors.indexOf(_constructor);
var superConstructors = superType.element.constructors
.where((element) => element.isAccessibleIn2(classElement.library))
.where((element) => element.isAccessibleIn(classElement.library))
.toList();
if (index < superConstructors.length) {
_baseConstructor = _BaseConstructor(
@ -351,10 +351,10 @@ class _InitializerInference {
_unitElement = unit as CompilationUnitElementImpl;
unit.classes.forEach(_addClassConstructorFieldFormals);
unit.classes.forEach(_addClassElementFields);
unit.enums2.forEach(_addClassConstructorFieldFormals);
unit.enums2.forEach(_addClassElementFields);
unit.enums.forEach(_addClassConstructorFieldFormals);
unit.enums.forEach(_addClassElementFields);
unit.extensions.forEach(_addExtensionElementFields);
unit.mixins2.forEach(_addClassElementFields);
unit.mixins.forEach(_addClassElementFields);
_scope = unit.enclosingElement.scope;
for (var element in unit.topLevelVariables) {

2
pkg/analyzer/lib/src/task/strong_mode.dart
View file

@ -33,7 +33,7 @@ class InstanceMemberInferrer {
typeSystem = unit.library.typeSystem as TypeSystemImpl;
isNonNullableByDefault = typeSystem.isNonNullableByDefault;
_inferClasses(unit.classes);
_inferClasses(unit.mixins2);
_inferClasses(unit.mixins);
}
/// Return `true` if the elements corresponding to the [elements] have the

22
pkg/analyzer/lib/src/test_utilities/find_element.dart
View file

@ -183,8 +183,8 @@ class FindElement extends _FindElementBase {
findInExecutables(unitElement.functions);
findInClasses(unitElement.classes);
findInClasses(unitElement.enums2);
findInClasses(unitElement.mixins2);
findInClasses(unitElement.enums);
findInClasses(unitElement.mixins);
for (var extension_ in unitElement.extensions) {
findInExecutables(extension_.accessors);
@ -216,7 +216,7 @@ class FindElement extends _FindElementBase {
CompilationUnitElement part(String targetUri) {
CompilationUnitElement? result;
for (final partElement in libraryElement.parts2) {
for (final partElement in libraryElement.parts) {
final uri = partElement.uri;
if (uri is DirectiveUriWithUnit) {
final unitElement = uri.unit;
@ -288,7 +288,7 @@ class FindElement extends _FindElementBase {
findInClass(class_);
}
for (var enum_ in unitElement.enums2) {
for (var enum_ in unitElement.enums) {
findInClass(enum_);
}
@ -296,7 +296,7 @@ class FindElement extends _FindElementBase {
findIn(extension_.typeParameters);
}
for (var mixin in unitElement.mixins2) {
for (var mixin in unitElement.mixins) {
findInClass(mixin);
}
@ -348,7 +348,7 @@ abstract class _FindElementBase {
return class_;
}
}
for (var mixin in unitElement.mixins2) {
for (var mixin in unitElement.mixins) {
if (mixin.name == name) {
return mixin;
}
@ -378,7 +378,7 @@ abstract class _FindElementBase {
}
}
for (var enum_ in unitElement.enums2) {
for (var enum_ in unitElement.enums) {
if (of == null || enum_.name == of) {
findIn(enum_.constructors);
}
@ -391,7 +391,7 @@ abstract class _FindElementBase {
}
EnumElement enum_(String name) {
for (var enum_ in unitElement.enums2) {
for (var enum_ in unitElement.enums) {
if (enum_.name == name) {
return enum_;
}
@ -433,7 +433,7 @@ abstract class _FindElementBase {
}
MixinElement mixin(String name) {
for (var mixin in unitElement.mixins2) {
for (var mixin in unitElement.mixins) {
if (mixin.name == name) {
return mixin;
}
@ -525,8 +525,8 @@ abstract class _FindElementBase {
var classes = [
...unitElement.classes,
...unitElement.enums2,
...unitElement.mixins2,
...unitElement.enums,
...unitElement.mixins,
];
var results = [

8
pkg/analyzer/test/src/dart/analysis/search_test.dart
View file

@ -1400,9 +1400,9 @@ part 'unitB.dart';
''');
LibraryElement element = result.libraryElement;
CompilationUnitElement unitElementA =
(element.parts2[0].uri as DirectiveUriWithUnit).unit;
(element.parts[0].uri as DirectiveUriWithUnit).unit;
CompilationUnitElement unitElementB =
(element.parts2[1].uri as DirectiveUriWithUnit).unit;
(element.parts[1].uri as DirectiveUriWithUnit).unit;
var expected = [
ExpectedResult(unitElementA, SearchResultKind.REFERENCE,
codeA.indexOf('lib; // A'), 'lib'.length),
@ -1438,9 +1438,9 @@ part 'unitB.dart';
''');
LibraryElement element = result.libraryElement;
CompilationUnitElement unitElementA =
(element.parts2[0].uri as DirectiveUriWithUnit).unit;
(element.parts[0].uri as DirectiveUriWithUnit).unit;
CompilationUnitElement unitElementB =
(element.parts2[1].uri as DirectiveUriWithUnit).unit;
(element.parts[1].uri as DirectiveUriWithUnit).unit;
var expected = [
ExpectedResult(unitElementA, SearchResultKind.REFERENCE,
codeA.indexOf('lib; // A'), 'lib'.length),

8
pkg/analyzer/test/src/dart/element/element_test.dart
View file

@ -447,14 +447,14 @@ class ElementImplTest extends AbstractTypeSystemTest {
(library1.definingCompilationUnit).classes = <ClassElement>[classElement];
LibraryElementImpl library2 =
ElementFactory.library(analysisContext, "lib2");
expect(classElement.isAccessibleIn2(library2), isFalse);
expect(classElement.isAccessibleIn(library2), isFalse);
}
void test_isAccessibleIn_private_sameLibrary() {
LibraryElementImpl library = ElementFactory.library(analysisContext, "lib");
ClassElement classElement = ElementFactory.classElement2("_C");
(library.definingCompilationUnit).classes = <ClassElement>[classElement];
expect(classElement.isAccessibleIn2(library), isTrue);
expect(classElement.isAccessibleIn(library), isTrue);
}
void test_isAccessibleIn_public_differentLibrary() {
@ -464,14 +464,14 @@ class ElementImplTest extends AbstractTypeSystemTest {
(library1.definingCompilationUnit).classes = <ClassElement>[classElement];
LibraryElementImpl library2 =
ElementFactory.library(analysisContext, "lib2");
expect(classElement.isAccessibleIn2(library2), isTrue);
expect(classElement.isAccessibleIn(library2), isTrue);
}
void test_isAccessibleIn_public_sameLibrary() {
LibraryElementImpl library = ElementFactory.library(analysisContext, "lib");
ClassElement classElement = ElementFactory.classElement2("C");
(library.definingCompilationUnit).classes = <ClassElement>[classElement];
expect(classElement.isAccessibleIn2(library), isTrue);
expect(classElement.isAccessibleIn(library), isTrue);
}
void test_isPrivate_false() {

6
pkg/analyzer/test/src/summary/element_text.dart
View file

@ -162,7 +162,7 @@ class _ElementWriter {
_writeLibraryOrAugmentationElement(e);
_writeElements('parts', e.parts2, _writePartElement);
_writeElements('parts', e.parts, _writePartElement);
if (withExportScope) {
_writelnWithIndent('exportedReferences');
@ -1026,9 +1026,9 @@ class _ElementWriter {
void _writeUnitElement(CompilationUnitElement e) {
_writeElements('classes', e.classes, _writeClassElement);
_writeElements('enums', e.enums2, _writeClassElement);
_writeElements('enums', e.enums, _writeClassElement);
_writeElements('extensions', e.extensions, _writeExtensionElement);
_writeElements('mixins', e.mixins2, _writeClassElement);
_writeElements('mixins', e.mixins, _writeClassElement);
_writeElements('typeAliases', e.typeAliases, _writeTypeAliasElement);
_writeElements(
'topLevelVariables',

6
pkg/analyzer/test/src/summary/elements_test.dart
View file

@ -27228,7 +27228,7 @@ import 'dart:math' as p1;
final p1 = library.prefixes.singleWhere((prefix) => prefix.name == 'p1');
final import_async = library.libraryImports[0];
final import_math = library.libraryImports[2];
expect(p1.imports2, unorderedEquals([import_async, import_math]));
expect(p1.imports, unorderedEquals([import_async, import_math]));
}
test_library_imports_syntheticDartCore() async {
@ -31991,7 +31991,7 @@ part 'b.dart';
// The difference with the test above is that we ask the part first.
// There was a bug that we were not loading library directives.
expect(library.parts2[0].metadata, isEmpty);
expect(library.parts[0].metadata, isEmpty);
}
test_metadata_prefixed_variable() async {
@ -32859,7 +32859,7 @@ mixin M {}
// We intentionally ask `mixins` directly, to check that we can ask them
// separately, without asking classes.
var mixins = library.definingCompilationUnit.mixins2;
var mixins = library.definingCompilationUnit.mixins;
expect(mixins, hasLength(1));
expect(mixins[0].name, 'M');
}

4
pkg/analyzer/test/src/summary/macro_test.dart
View file

@ -1806,7 +1806,7 @@ class A {}
}
if (expected != null) {
final partUri = library.parts2.single.uri as DirectiveUriWithUnit;
final partUri = library.parts.single.uri as DirectiveUriWithUnit;
final x = partUri.unit.topLevelVariables.single;
expect(x.name, 'x');
x as ConstTopLevelVariableElementImpl;
@ -1869,7 +1869,7 @@ $declarationCode
library.definingCompilationUnit.getClass('A'),
);
final partUri = library.parts2.single.uri as DirectiveUriWithUnit;
final partUri = library.parts.single.uri as DirectiveUriWithUnit;
final x = partUri.unit.topLevelVariables.single;
expect(x.name, 'x');
x as ConstTopLevelVariableElementImpl;

2
pkg/analyzer/test/src/utilities/extensions/ast_test.dart
View file

@ -303,7 +303,7 @@ class C { void call() {} } Function f = C^();
// TODO(brianwilkerson) Move TestCode to the analyzer package and make use
// of it here.
var offset = sourceCode.indexOf('^');
if (offset < 0 || sourceCode.indexOf('^', offset + 1) >= 0) {
if (offset < 0 || sourceCode.contains('^', offset + 1)) {
fail('Tests must contain a single selection range');
}
var testCode =

2
pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
View file

@ -3165,7 +3165,7 @@ class B extends A {
{
var unitResult = (await resolveFile(path)).unit;
if (targetMixinName != null) {
targetElement = unitResult.declaredElement!.mixins2
targetElement = unitResult.declaredElement!.mixins
.firstWhere((e) => e.name == targetMixinName);
} else {
targetElement = unitResult.declaredElement!.classes

2
pkg/nnbd_migration/test/already_migrated_code_decorator_test.dart
View file

@ -427,7 +427,7 @@ class _AlreadyMigratedCodeDecoratorTestBase {
'mixin C on num {}',
);
var unitElement = withUnit.unitElement;
var mixin_ = unitElement.mixins2.single;
var mixin_ = unitElement.mixins.single;
var withElement = withUnit.withElement(mixin_);