Breaking changes for analyzer version 9.0.0
Change-Id: I4d1b611edcf5340543b5cabf93b88a103408920b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444924
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/base/errors.dart b/pkg/_fe_analyzer_shared/lib/src/base/errors.dart
index 251f65e..c2d5526 100644
--- a/pkg/_fe_analyzer_shared/lib/src/base/errors.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/base/errors.dart
@@ -71,10 +71,6 @@
/// being reported. The list will be empty if there are no such messages.
final List<DiagnosticMessage> contextMessages;
- /// Data associated with this diagnostic, specific for [diagnosticCode].
- @Deprecated('Use an expando instead')
- final Object? data;
-
/// A description of how to fix the problem, or `null` if there is no such
/// description.
final String? correctionMessage;
@@ -89,15 +85,11 @@
required this.source,
required int offset,
required int length,
- DiagnosticCode? diagnosticCode,
- @Deprecated("Pass a value for 'diagnosticCode' instead")
- DiagnosticCode? errorCode,
+ required this.diagnosticCode,
required String message,
this.correctionMessage,
this.contextMessages = const [],
- @Deprecated('Use an expando instead') this.data,
- }) : diagnosticCode = _useNonNullCodeBetween(diagnosticCode, errorCode),
- problemMessage = new DiagnosticMessageImpl(
+ }) : problemMessage = new DiagnosticMessageImpl(
filePath: source.fullName,
length: length,
message: message,
@@ -109,31 +101,27 @@
///
/// The diagnostic is associated with the given [source] and is located at the
/// given [offset] with the given [length]. The diagnostic will have the given
- /// [errorCode] and the list of [arguments] will be used to complete the
+ /// [diagnosticCode] and the list of [arguments] will be used to complete the
/// message and correction. If any [contextMessages] are provided, they will
/// be recorded with the diagnostic.
factory Diagnostic.tmp({
required Source source,
required int offset,
required int length,
- DiagnosticCode? diagnosticCode,
- @Deprecated("Pass a value for 'diagnosticCode' instead")
- DiagnosticCode? errorCode,
+ required DiagnosticCode diagnosticCode,
List<Object?> arguments = const [],
List<DiagnosticMessage> contextMessages = const [],
- @Deprecated('Use an expando instead') Object? data,
}) {
- DiagnosticCode code = _useNonNullCodeBetween(diagnosticCode, errorCode);
assert(
- arguments.length == code.numParameters,
- 'Message $code requires ${code.numParameters} '
- 'argument${code.numParameters == 1 ? '' : 's'}, but '
+ arguments.length == diagnosticCode.numParameters,
+ 'Message $diagnosticCode requires ${diagnosticCode.numParameters} '
+ 'argument${diagnosticCode.numParameters == 1 ? '' : 's'}, but '
'${arguments.length} '
'argument${arguments.length == 1 ? ' was' : 's were'} '
'provided',
);
- String message = formatList(code.problemMessage, arguments);
- String? correctionTemplate = code.correctionMessage;
+ String message = formatList(diagnosticCode.problemMessage, arguments);
+ String? correctionTemplate = diagnosticCode.correctionMessage;
String? correctionMessage;
if (correctionTemplate != null) {
correctionMessage = formatList(correctionTemplate, arguments);
@@ -143,12 +131,10 @@
source: source,
offset: offset,
length: length,
- diagnosticCode: code,
+ diagnosticCode: diagnosticCode,
message: message,
correctionMessage: correctionMessage,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
@@ -233,19 +219,6 @@
buffer.write(message);
return buffer.toString();
}
-
- /// The non-`null` [DiagnosticCode] value between the two parameters.
- static DiagnosticCode _useNonNullCodeBetween(
- DiagnosticCode? diagnosticCode,
- DiagnosticCode? errorCode,
- ) {
- if ((diagnosticCode == null) == (errorCode == null)) {
- throw new ArgumentError(
- "Exactly one of 'diagnosticCode' and 'errorCode' may be passed",
- );
- }
- return diagnosticCode ?? errorCode!;
- }
}
/// Private subtype of [DiagnosticCode] that supports runtime checking of
diff --git a/pkg/analysis_server/test/protocol_server_test.dart b/pkg/analysis_server/test/protocol_server_test.dart
index fb66589..4e26dc9 100644
--- a/pkg/analysis_server/test/protocol_server_test.dart
+++ b/pkg/analysis_server/test/protocol_server_test.dart
@@ -364,9 +364,6 @@
String? get correctionMessage => _correctionMessage;
@override
- Object? get data => throw UnimplementedError();
-
- @override
engine.DiagnosticCode get diagnosticCode => _diagnosticCode!;
@override
diff --git a/pkg/analysis_server_plugin/pubspec.yaml b/pkg/analysis_server_plugin/pubspec.yaml
index 6612ba8..4498257 100644
--- a/pkg/analysis_server_plugin/pubspec.yaml
+++ b/pkg/analysis_server_plugin/pubspec.yaml
@@ -1,6 +1,6 @@
name: analysis_server_plugin
description: A framework and support code for building plugins for the analysis server.
-version: 0.3.3
+version: 0.3.4-dev
repository: https://github.com/dart-lang/sdk/tree/main/pkg/analysis_server_plugin
environment:
@@ -11,8 +11,8 @@
dependencies:
# See the release policy for managing this dependency at
# pkg/analyzer/doc/implementation/releasing.md.
- analyzer: 8.4.0
- analyzer_plugin: 0.13.10
+ analyzer: ^9.0.0-0
+ analyzer_plugin: 0.13.11-dev
meta: ^1.16.0
yaml: ^3.1.0
yaml_edit: ^2.2.0
diff --git a/pkg/analyzer/CHANGELOG.md b/pkg/analyzer/CHANGELOG.md
index 499bb5a..2d7854c 100644
--- a/pkg/analyzer/CHANGELOG.md
+++ b/pkg/analyzer/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 9.0.0-dev
+* Remove deprecated field `Diagnostic.data`.
+* In the method `DiagnosticReporter.atOffset` and the constructors
+ `Diagnostic.tmp` and `Diagnostic.forValues`, remove the deprecated named
+ parameter `errorCode`, and make the named parameter `diagnosticCode`
+ non-nullable and required.
+* Remove deprecated `DiagnosticReporter.atOffset` named parameter, `errorCode`.
+* Remove deprecated `BooleanErrorListener`.
+* Remove deprecated `RecordingErrorListener`.
+* Remove deprecated `AnalysisErrorListener.NULL_LISTENER`.
+* Remove deprecated `AstNodeExtension`.
+* Remove deprecated `NullShortableExpression`.
+* Remove deprecated getters and methods from AST and element model.
+* Remove deprecated `PartDirective.configurations`.
+* Remove deprecated `TypeDefiningElement`.
+* Remove deprecated `TypeAliasElement.aliasedElement`.
+
## 8.4.0
* Add the `experimental_member_use` warning, which warns about any reference to
a declaration annotated with `@experimental`.
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index dda20cf..729459f 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt
@@ -463,12 +463,6 @@
new (constructor: CannotResolveUriResult Function())
DisposedAnalysisContextResult (class extends Object implements InvalidResult, SomeErrorsResult, SomeFileResult, SomeParsedLibraryResult, SomeParsedUnitResult, SomeResolvedLibraryResult, SomeResolvedUnitResult, SomeUnitElementResult):
new (constructor: DisposedAnalysisContextResult Function())
- ElementDeclarationResult (class extends Object, deprecated):
- new (constructor: ElementDeclarationResult Function())
- fragment (getter: Fragment)
- node (getter: AstNode)
- parsedUnit (getter: ParsedUnitResult?)
- resolvedUnit (getter: ResolvedUnitResult?)
ErrorsResult (class extends Object implements SomeErrorsResult, AnalysisResultWithDiagnostics):
new (constructor: ErrorsResult Function())
FileResult (class extends Object implements SomeFileResult, AnalysisResult):
@@ -494,7 +488,6 @@
LibraryElementResult (class extends Object implements SomeLibraryElementResult):
new (constructor: LibraryElementResult Function())
element (getter: LibraryElement)
- element2 (getter: LibraryElement, deprecated)
MissingSdkLibraryResult (class extends Object implements InvalidResult, SomeErrorsResult, SomeResolvedLibraryResult, SomeResolvedUnitResult, SomeLibraryElementResult, SomeUnitElementResult):
new (constructor: MissingSdkLibraryResult Function())
missingUri (getter: Uri)
@@ -513,7 +506,6 @@
ParsedLibraryResult (class extends Object implements SomeParsedLibraryResult, AnalysisResult):
new (constructor: ParsedLibraryResult Function())
units (getter: List<ParsedUnitResult>)
- getElementDeclaration2 (method: ElementDeclarationResult? Function(Fragment), deprecated)
getFragmentDeclaration (method: FragmentDeclarationResult? Function(Fragment))
ParsedUnitResult (class extends Object implements SomeParsedUnitResult, AnalysisResultWithDiagnostics):
new (constructor: ParsedUnitResult Function())
@@ -521,7 +513,6 @@
ResolvedLibraryResult (class extends Object implements ParsedLibraryResult, SomeResolvedLibraryResult):
new (constructor: ResolvedLibraryResult Function())
element (getter: LibraryElement)
- element2 (getter: LibraryElement, deprecated)
typeProvider (getter: TypeProvider)
units (getter: List<ResolvedUnitResult>)
unitWithPath (method: ResolvedUnitResult? Function(String))
@@ -529,7 +520,6 @@
new (constructor: ResolvedUnitResult Function())
exists (getter: bool)
libraryElement (getter: LibraryElement)
- libraryElement2 (getter: LibraryElement, deprecated)
libraryFragment (getter: LibraryFragment)
typeProvider (getter: TypeProvider)
typeSystem (getter: TypeSystem)
@@ -569,11 +559,9 @@
getLibraryByUri (method: Future<SomeLibraryElementResult> Function(String))
getParsedLibrary (method: SomeParsedLibraryResult Function(String))
getParsedLibraryByElement (method: SomeParsedLibraryResult Function(LibraryElement))
- getParsedLibraryByElement2 (method: SomeParsedLibraryResult Function(LibraryElement), deprecated)
getParsedUnit (method: SomeParsedUnitResult Function(String))
getResolvedLibrary (method: Future<SomeResolvedLibraryResult> Function(String))
getResolvedLibraryByElement (method: Future<SomeResolvedLibraryResult> Function(LibraryElement))
- getResolvedLibraryByElement2 (method: Future<SomeResolvedLibraryResult> Function(LibraryElement), deprecated)
getResolvedLibraryContaining (method: Future<SomeResolvedLibraryResult> Function(String))
getResolvedUnit (method: Future<SomeResolvedUnitResult> Function(String))
getUnitElement (method: Future<SomeUnitElementResult> Function(String))
@@ -602,7 +590,6 @@
atSign (getter: Token)
constructorName (getter: SimpleIdentifier?)
element (getter: Element?)
- element2 (getter: Element?, deprecated)
elementAnnotation (getter: ElementAnnotation?)
name (getter: Identifier)
parent (getter: AstNode)
@@ -628,8 +615,7 @@
rightParenthesis (getter: Token)
AssignedVariablePattern (class extends Object implements VariablePattern):
element (getter: Element?)
- element2 (getter: Element?, deprecated)
- AssignmentExpression (class extends Object implements NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
+ AssignmentExpression (class extends Object implements MethodReferenceExpression, CompoundAssignmentExpression):
leftHandSide (getter: Expression)
operator (getter: Token)
rightHandSide (getter: Expression)
@@ -859,7 +845,7 @@
label (getter: SimpleIdentifier?)
semicolon (getter: Token)
target (getter: AstNode?)
- CascadeExpression (class extends Object implements Expression, NullShortableExpression):
+ CascadeExpression (class extends Object implements Expression):
cascadeSections (getter: NodeList<Expression>)
isNullAware (getter: bool)
target (getter: Expression)
@@ -881,8 +867,6 @@
rightParenthesis (getter: Token?)
stackTraceParameter (getter: CatchClauseParameter?)
CatchClauseParameter (class extends AstNode):
- declaredElement (getter: LocalVariableElement?, deprecated)
- declaredElement2 (getter: LocalVariableElement?, deprecated)
declaredFragment (getter: LocalVariableFragment?)
name (getter: Token)
ClassBody (class extends Object implements AstNode, sealed (immediate subtypes: BlockClassBody, ClassBodyImpl, EmptyClassBody, EnumBody), experimental)
@@ -898,7 +882,6 @@
implementsClause (getter: ImplementsClause?)
interfaceKeyword (getter: Token?)
leftBracket (getter: Token)
- macroKeyword (getter: Token?, deprecated)
members (getter: NodeList<ClassMember>)
mixinKeyword (getter: Token?)
namePart (getter: ClassNamePart?, experimental)
@@ -954,10 +937,8 @@
CompilationUnitMember (class extends Object implements Declaration)
CompoundAssignmentExpression (class extends Object implements Expression):
readElement (getter: Element?)
- readElement2 (getter: Element?, deprecated)
readType (getter: DartType?)
writeElement (getter: Element?)
- writeElement2 (getter: Element?, deprecated)
writeType (getter: DartType?)
ConditionalExpression (class extends Object implements Expression):
colon (getter: Token)
@@ -1021,8 +1002,6 @@
Declaration (class extends Object implements AnnotatedNode):
declaredFragment (getter: Fragment?)
DeclaredIdentifier (class extends Object implements Declaration):
- declaredElement (getter: LocalVariableElement?, deprecated)
- declaredElement2 (getter: LocalVariableElement?, deprecated)
declaredFragment (getter: LocalVariableFragment?)
isConst (getter: bool)
isFinal (getter: bool)
@@ -1030,8 +1009,6 @@
name (getter: Token)
type (getter: TypeAnnotation?)
DeclaredVariablePattern (class extends Object implements VariablePattern, sealed (immediate subtypes: DeclaredVariablePatternImpl)):
- declaredElement (getter: BindPatternVariableElement?, deprecated)
- declaredElement2 (getter: BindPatternVariableElement?, deprecated)
declaredFragment (getter: BindPatternVariableFragment?)
keyword (getter: Token?)
type (getter: TypeAnnotation?)
@@ -1084,7 +1061,6 @@
arguments (getter: EnumConstantArguments?)
augmentKeyword (getter: Token?)
constructorElement (getter: ConstructorElement?)
- constructorElement2 (getter: ConstructorElement?, deprecated)
declaredFragment (getter: FieldFragment?)
name (getter: Token)
EnumDeclaration (class extends Object implements NamedCompilationUnitMember):
@@ -1143,7 +1119,6 @@
ExtensionOverride (class extends Object implements Expression):
argumentList (getter: ArgumentList)
element (getter: ExtensionElement)
- element2 (getter: ExtensionElement, deprecated)
extendedType (getter: DartType?)
importPrefix (getter: ImportPrefixReference?)
isNullAware (getter: bool)
@@ -1247,7 +1222,6 @@
keyword (getter: Token?)
star (getter: Token?)
isPotentiallyMutatedInScope (method: bool Function(VariableElement))
- isPotentiallyMutatedInScope2 (method: bool Function(VariableElement), deprecated)
FunctionDeclaration (class extends Object implements NamedCompilationUnitMember):
augmentKeyword (getter: Token?)
declaredFragment (getter: ExecutableFragment?)
@@ -1264,7 +1238,7 @@
declaredFragment (getter: ExecutableFragment?)
parameters (getter: FormalParameterList?)
typeParameters (getter: TypeParameterList?)
- FunctionExpressionInvocation (class extends Object implements NullShortableExpression, InvocationExpression):
+ FunctionExpressionInvocation (class extends Object implements InvocationExpression):
element (getter: ExecutableElement?)
function (getter: Expression)
FunctionReference (class extends Object implements Expression, CommentReferableExpression):
@@ -1335,10 +1309,9 @@
prefix (getter: SimpleIdentifier?)
ImportPrefixReference (class extends Object implements AstNode):
element (getter: Element?)
- element2 (getter: Element?, deprecated)
name (getter: Token)
period (getter: Token)
- IndexExpression (class extends Object implements NullShortableExpression, MethodReferenceExpression):
+ IndexExpression (class extends Object implements MethodReferenceExpression):
index (getter: Expression)
isCascaded (getter: bool)
isNullAware (getter: bool)
@@ -1388,10 +1361,8 @@
statement (getter: Statement)
LibraryDirective (class extends Object implements Directive):
element (getter: LibraryElement?)
- element2 (getter: LibraryElement?, deprecated)
libraryKeyword (getter: Token)
name (getter: LibraryIdentifier?)
- name2 (getter: LibraryIdentifier?, deprecated)
semicolon (getter: Token)
LibraryIdentifier (class extends Object implements Identifier):
components (getter: NodeList<SimpleIdentifier>)
@@ -1449,7 +1420,7 @@
propertyKeyword (getter: Token?)
returnType (getter: TypeAnnotation?)
typeParameters (getter: TypeParameterList?)
- MethodInvocation (class extends Object implements NullShortableExpression, InvocationExpression):
+ MethodInvocation (class extends Object implements InvocationExpression):
isCascaded (getter: bool)
isNullAware (getter: bool)
methodName (getter: SimpleIdentifier)
@@ -1478,16 +1449,13 @@
name (getter: Token)
NamedExpression (class extends Object implements Expression):
element (getter: FormalParameterElement?)
- element2 (getter: FormalParameterElement?, deprecated)
expression (getter: Expression)
name (getter: Label)
NamedType (class extends Object implements TypeAnnotation):
element (getter: Element?)
- element2 (getter: Element?, deprecated)
importPrefix (getter: ImportPrefixReference?)
isDeferred (getter: bool)
name (getter: Token)
- name2 (getter: Token, deprecated)
type (getter: DartType?)
typeArguments (getter: TypeArgumentList?)
NamespaceDirective (class extends Object implements UriBasedDirective, sealed (immediate subtypes: ExportDirective, ImportDirective, NamespaceDirectiveImpl)):
@@ -1525,8 +1493,6 @@
pattern (getter: DartPattern)
NullLiteral (class extends Object implements Literal):
literal (getter: Token)
- NullShortableExpression (class extends Object implements Expression, deprecated):
- nullShortingTermination (getter: Expression, deprecated)
ObjectPattern (class extends Object implements DartPattern):
fields (getter: NodeList<PatternField>)
leftParenthesis (getter: Token)
@@ -1541,7 +1507,6 @@
pattern (getter: DartPattern)
rightParenthesis (getter: Token)
PartDirective (class extends Object implements UriBasedDirective):
- configurations (getter: NodeList<Configuration>, deprecated)
partInclude (getter: PartInclude?)
partKeyword (getter: Token)
semicolon (getter: Token)
@@ -1558,7 +1523,6 @@
PatternField (class extends Object implements AstNode):
effectiveName (getter: String?)
element (getter: Element?)
- element2 (getter: Element?, deprecated)
name (getter: PatternFieldName?)
pattern (getter: DartPattern)
PatternFieldName (class extends Object implements AstNode):
@@ -1572,11 +1536,11 @@
PatternVariableDeclarationStatement (class extends Object implements Statement):
declaration (getter: PatternVariableDeclaration)
semicolon (getter: Token)
- PostfixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
+ PostfixExpression (class extends Object implements Expression, MethodReferenceExpression, CompoundAssignmentExpression):
element (getter: MethodElement?)
operand (getter: Expression)
operator (getter: Token)
- PrefixExpression (class extends Object implements Expression, NullShortableExpression, MethodReferenceExpression, CompoundAssignmentExpression):
+ PrefixExpression (class extends Object implements Expression, MethodReferenceExpression, CompoundAssignmentExpression):
element (getter: MethodElement?)
operand (getter: Expression)
operator (getter: Token)
@@ -1592,7 +1556,7 @@
PrimaryConstructorName (class extends Object implements AstNode, experimental):
name (getter: Token)
period (getter: Token)
- PropertyAccess (class extends Object implements NullShortableExpression, CommentReferableExpression):
+ PropertyAccess (class extends Object implements CommentReferableExpression):
isCascaded (getter: bool)
isNullAware (getter: bool)
operator (getter: Token)
@@ -1632,7 +1596,6 @@
thisKeyword (getter: Token)
RelationalPattern (class extends Object implements DartPattern):
element (getter: MethodElement?)
- element2 (getter: MethodElement?, deprecated)
operand (getter: Expression)
operator (getter: Token)
RepresentationConstructorName (class extends Object implements AstNode):
@@ -1792,8 +1755,6 @@
UriBasedDirective (class extends Object implements Directive, sealed (immediate subtypes: NamespaceDirective, PartDirective, UriBasedDirectiveImpl)):
uri (getter: StringLiteral)
VariableDeclaration (class extends Object implements Declaration):
- declaredElement (getter: LocalVariableElement?, deprecated)
- declaredElement2 (getter: LocalVariableElement?, deprecated)
declaredFragment (getter: VariableFragment?)
equals (getter: Token?)
initializer (getter: Expression?)
@@ -3346,7 +3307,6 @@
ConstructorInvocation (class extends Object):
new (constructor: ConstructorInvocation Function())
constructor (getter: ConstructorElement)
- constructor2 (getter: ConstructorElement, deprecated)
namedArguments (getter: Map<String, DartObject>)
positionalArguments (getter: List<DartObject>)
DartObject (class extends Object):
@@ -3356,12 +3316,10 @@
isNull (getter: bool)
type (getter: DartType?)
variable (getter: VariableElement?)
- variable2 (getter: VariableElement?, deprecated)
getField (method: DartObject? Function(String))
toBoolValue (method: bool? Function())
toDoubleValue (method: double? Function())
toFunctionValue (method: ExecutableElement? Function())
- toFunctionValue2 (method: ExecutableElement? Function(), deprecated)
toIntValue (method: int? Function())
toListValue (method: List<DartObject>? Function())
toMapValue (method: Map<DartObject?, DartObject?>? Function())
@@ -3371,11 +3329,6 @@
toSymbolValue (method: String? Function())
toTypeValue (method: DartType? Function())
package:analyzer/dart/element/element.dart:
- Annotatable (class extends Object, deprecated):
- new (constructor: Annotatable Function())
- documentationComment (getter: String?)
- metadata (getter: Metadata)
- metadata2 (getter: Metadata, deprecated)
BindPatternVariableElement (class extends Object implements PatternVariableElement):
new (constructor: BindPatternVariableElement Function())
firstFragment (getter: BindPatternVariableFragment)
@@ -3405,12 +3358,6 @@
isMixinClass (getter: bool)
isSealed (getter: bool)
isValidMixin (getter: bool)
- isExtendableIn (method: bool Function(LibraryElement), deprecated)
- isExtendableIn2 (method: bool Function(LibraryElement), deprecated)
- isImplementableIn (method: bool Function(LibraryElement), deprecated)
- isImplementableIn2 (method: bool Function(LibraryElement), deprecated)
- isMixableIn (method: bool Function(LibraryElement), deprecated)
- isMixableIn2 (method: bool Function(LibraryElement), deprecated)
ClassFragment (class extends Object implements InterfaceFragment):
new (constructor: ClassFragment Function())
element (getter: ClassElement)
@@ -3420,7 +3367,6 @@
new (constructor: ConstructorElement Function())
baseElement (getter: ConstructorElement)
enclosingElement (getter: InterfaceElement)
- enclosingElement2 (getter: InterfaceElement, deprecated)
firstFragment (getter: ConstructorFragment)
fragments (getter: List<ConstructorFragment>)
isConst (getter: bool)
@@ -3428,18 +3374,14 @@
isFactory (getter: bool)
isGenerative (getter: bool)
name (getter: String?)
- name3 (getter: String?, deprecated)
redirectedConstructor (getter: ConstructorElement?)
- redirectedConstructor2 (getter: ConstructorElement?, deprecated)
returnType (getter: InterfaceType)
superConstructor (getter: ConstructorElement?)
- superConstructor2 (getter: ConstructorElement?, deprecated)
ConstructorFragment (class extends Object implements ExecutableFragment):
new (constructor: ConstructorFragment Function())
element (getter: ConstructorElement)
enclosingFragment (getter: InstanceFragment?)
name (getter: String)
- name2 (getter: String, deprecated)
nextFragment (getter: ConstructorFragment?)
offset (getter: int)
periodOffset (getter: int?)
@@ -3451,7 +3393,6 @@
DirectiveUriWithLibrary (class extends DirectiveUriWithSource):
new (constructor: DirectiveUriWithLibrary Function())
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
DirectiveUriWithRelativeUri (class extends DirectiveUriWithRelativeUriString):
new (constructor: DirectiveUriWithRelativeUri Function())
relativeUri (getter: Uri)
@@ -3468,11 +3409,9 @@
new (constructor: Element Function())
baseElement (getter: Element)
children (getter: List<Element>)
- children2 (getter: List<Element>, deprecated)
displayName (getter: String)
documentationComment (getter: String?)
enclosingElement (getter: Element?)
- enclosingElement2 (getter: Element?, deprecated)
firstFragment (getter: Fragment)
fragments (getter: List<Fragment>)
id (getter: int)
@@ -3481,36 +3420,25 @@
isSynthetic (getter: bool)
kind (getter: ElementKind)
library (getter: LibraryElement?)
- library2 (getter: LibraryElement?, deprecated)
lookupName (getter: String?)
metadata (getter: Metadata)
name (getter: String?)
- name3 (getter: String?, deprecated)
nonSynthetic (getter: Element)
- nonSynthetic2 (getter: Element, deprecated)
session (getter: AnalysisSession?)
sinceSdkVersion (getter: Version?)
accept (method: T? Function<T>(ElementVisitor2<T>))
- accept2 (method: T? Function<T>(ElementVisitor2<T>), deprecated)
displayString (method: String Function({bool multiline, bool preferTypeAlias}))
- displayString2 (method: String Function({bool multiline, bool preferTypeAlias}), deprecated)
getExtendedDisplayName (method: String Function({String? shortName}))
- getExtendedDisplayName2 (method: String Function({String? shortName}), deprecated)
isAccessibleIn (method: bool Function(LibraryElement))
- isAccessibleIn2 (method: bool Function(LibraryElement), deprecated)
isDeprecatedWithKind (method: bool Function(String))
thisOrAncestorMatching (method: Element? Function(bool Function(Element)))
- thisOrAncestorMatching2 (method: Element? Function(bool Function(Element)), deprecated)
thisOrAncestorOfType (method: E? Function<E extends Element>())
- thisOrAncestorOfType2 (method: E? Function<E extends Element>(), deprecated)
visitChildren (method: void Function<T>(ElementVisitor2<T>))
- visitChildren2 (method: void Function<T>(ElementVisitor2<T>), deprecated)
ElementAnnotation (class extends Object):
new (constructor: ElementAnnotation Function())
constantEvaluationErrors (getter: List<Diagnostic>?)
deprecationKind (getter: String?)
element (getter: Element?)
- element2 (getter: Element?, deprecated)
isAlwaysThrows (getter: bool)
isAwaitNotRequired (getter: bool)
isDeprecated (getter: bool)
@@ -3546,7 +3474,7 @@
libraryFragment (getter: LibraryFragment)
computeConstantValue (method: DartObject? Function())
toSource (method: String Function())
- ElementDirective (class extends Object implements Annotatable):
+ ElementDirective (class extends Object):
new (constructor: ElementDirective Function())
libraryFragment (getter: LibraryFragment)
metadata (getter: Metadata)
@@ -3622,13 +3550,11 @@
EnumElement (class extends Object implements InterfaceElement):
new (constructor: EnumElement Function())
constants (getter: List<FieldElement>)
- constants2 (getter: List<FieldElement>, deprecated)
firstFragment (getter: EnumFragment)
fragments (getter: List<EnumFragment>)
EnumFragment (class extends Object implements InterfaceFragment):
new (constructor: EnumFragment Function())
constants (getter: List<FieldElement>)
- constants2 (getter: List<FieldElement>, deprecated)
element (getter: EnumElement)
nextFragment (getter: EnumFragment?)
previousFragment (getter: EnumFragment?)
@@ -3669,24 +3595,17 @@
firstFragment (getter: ExtensionTypeFragment)
fragments (getter: List<ExtensionTypeFragment>)
primaryConstructor (getter: ConstructorElement)
- primaryConstructor2 (getter: ConstructorElement, deprecated)
representation (getter: FieldElement)
- representation2 (getter: FieldElement, deprecated)
typeErasure (getter: DartType)
ExtensionTypeFragment (class extends Object implements InterfaceFragment):
new (constructor: ExtensionTypeFragment Function())
element (getter: ExtensionTypeElement)
nextFragment (getter: ExtensionTypeFragment?)
previousFragment (getter: ExtensionTypeFragment?)
- primaryConstructor (getter: ConstructorFragment, deprecated)
- primaryConstructor2 (getter: ConstructorFragment, deprecated)
- representation (getter: FieldFragment, deprecated)
- representation2 (getter: FieldFragment, deprecated)
FieldElement (class extends Object implements PropertyInducingElement):
new (constructor: FieldElement Function())
baseElement (getter: FieldElement)
enclosingElement (getter: InstanceElement)
- enclosingElement2 (getter: InstanceElement, deprecated)
firstFragment (getter: FieldFragment)
fragments (getter: List<FieldFragment>)
isAbstract (getter: bool)
@@ -3697,7 +3616,6 @@
FieldFormalParameterElement (class extends Object implements FormalParameterElement):
new (constructor: FieldFormalParameterElement Function())
field (getter: FieldElement?)
- field2 (getter: FieldElement?, deprecated)
firstFragment (getter: FieldFormalParameterFragment)
fragments (getter: List<FieldFormalParameterFragment>)
FieldFormalParameterFragment (class extends Object implements FormalParameterFragment):
@@ -3711,7 +3629,7 @@
nextFragment (getter: FieldFragment?)
offset (getter: int)
previousFragment (getter: FieldFragment?)
- FormalParameterElement (class extends Object implements VariableElement, Annotatable, LocalElement):
+ FormalParameterElement (class extends Object implements VariableElement, LocalElement):
new (constructor: FormalParameterElement Function())
baseElement (getter: FormalParameterElement)
defaultValueCode (getter: String?)
@@ -3731,10 +3649,8 @@
isRequiredPositional (getter: bool)
isSuperFormal (getter: bool)
typeParameters (getter: List<TypeParameterElement>)
- typeParameters2 (getter: List<TypeParameterElement>, deprecated)
appendToWithoutDelimiters (method: void Function(StringBuffer))
- appendToWithoutDelimiters2 (method: void Function(StringBuffer), deprecated)
- FormalParameterFragment (class extends Object implements VariableFragment, Annotatable, LocalFragment):
+ FormalParameterFragment (class extends Object implements VariableFragment, LocalFragment):
new (constructor: FormalParameterFragment Function())
element (getter: FormalParameterElement)
nextFragment (getter: FormalParameterFragment?)
@@ -3743,16 +3659,13 @@
Fragment (class extends Object):
new (constructor: Fragment Function())
children (getter: List<Fragment>)
- children3 (getter: List<Fragment>, deprecated)
documentationComment (getter: String?)
element (getter: Element)
enclosingFragment (getter: Fragment?)
libraryFragment (getter: LibraryFragment?)
metadata (getter: Metadata)
name (getter: String?)
- name2 (getter: String?, deprecated)
nameOffset (getter: int?)
- nameOffset2 (getter: int?, deprecated)
nextFragment (getter: Fragment?)
offset (getter: int)
previousFragment (getter: Fragment?)
@@ -3783,7 +3696,6 @@
new (constructor: GetterElement Function())
baseElement (getter: GetterElement)
correspondingSetter (getter: SetterElement?)
- correspondingSetter2 (getter: SetterElement?, deprecated)
firstFragment (getter: GetterFragment)
fragments (getter: List<GetterFragment>)
GetterFragment (class extends Object implements PropertyAccessorFragment):
@@ -3795,47 +3707,33 @@
HideElementCombinator (class extends Object implements NamespaceCombinator):
new (constructor: HideElementCombinator Function())
hiddenNames (getter: List<String>)
- InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement):
+ InstanceElement (class extends Object implements TypeParameterizedElement):
new (constructor: InstanceElement Function())
baseElement (getter: InstanceElement)
enclosingElement (getter: LibraryElement)
- enclosingElement2 (getter: LibraryElement, deprecated)
fields (getter: List<FieldElement>)
- fields2 (getter: List<FieldElement>, deprecated)
firstFragment (getter: InstanceFragment)
fragments (getter: List<InstanceFragment>)
getters (getter: List<GetterElement>)
- getters2 (getter: List<GetterElement>, deprecated)
methods (getter: List<MethodElement>)
- methods2 (getter: List<MethodElement>, deprecated)
setters (getter: List<SetterElement>)
- setters2 (getter: List<SetterElement>, deprecated)
thisType (getter: DartType)
getField (method: FieldElement? Function(String))
- getField2 (method: FieldElement? Function(String), deprecated)
getGetter (method: GetterElement? Function(String))
- getGetter2 (method: GetterElement? Function(String), deprecated)
getMethod (method: MethodElement? Function(String))
- getMethod2 (method: MethodElement? Function(String), deprecated)
getSetter (method: SetterElement? Function(String))
- getSetter2 (method: SetterElement? Function(String), deprecated)
lookUpGetter (method: GetterElement? Function({required LibraryElement library, required String name}))
- lookUpGetter2 (method: GetterElement? Function({required LibraryElement library, required String name}), deprecated)
lookUpMethod (method: MethodElement? Function({required LibraryElement library, required String name}))
- lookUpMethod2 (method: MethodElement? Function({required LibraryElement library, required String name}), deprecated)
lookUpSetter (method: SetterElement? Function({required LibraryElement library, required String name}))
- lookUpSetter2 (method: SetterElement? Function({required LibraryElement library, required String name}), deprecated)
- InstanceFragment (class extends Object implements TypeDefiningFragment, TypeParameterizedFragment):
+ InstanceFragment (class extends Object implements TypeParameterizedFragment):
new (constructor: InstanceFragment Function())
element (getter: InstanceElement)
enclosingFragment (getter: LibraryFragment?)
fields (getter: List<FieldFragment>)
- fields2 (getter: List<FieldFragment>, deprecated)
getters (getter: List<GetterFragment>)
isAugmentation (getter: bool)
libraryFragment (getter: LibraryFragment)
methods (getter: List<MethodFragment>)
- methods2 (getter: List<MethodFragment>, deprecated)
nextFragment (getter: InstanceFragment?)
previousFragment (getter: InstanceFragment?)
setters (getter: List<SetterFragment>)
@@ -3843,7 +3741,6 @@
new (constructor: InterfaceElement Function())
allSupertypes (getter: List<InterfaceType>)
constructors (getter: List<ConstructorElement>)
- constructors2 (getter: List<ConstructorElement>, deprecated)
firstFragment (getter: InterfaceFragment)
fragments (getter: List<InterfaceFragment>)
inheritedConcreteMembers (getter: Map<Name, ExecutableElement>)
@@ -3854,34 +3751,26 @@
supertype (getter: InterfaceType?)
thisType (getter: InterfaceType)
unnamedConstructor (getter: ConstructorElement?)
- unnamedConstructor2 (getter: ConstructorElement?, deprecated)
getInheritedConcreteMember (method: ExecutableElement? Function(Name))
getInheritedMember (method: ExecutableElement? Function(Name))
getInterfaceMember (method: ExecutableElement? Function(Name))
getNamedConstructor (method: ConstructorElement? Function(String))
- getNamedConstructor2 (method: ConstructorElement? Function(String), deprecated)
getOverridden (method: List<ExecutableElement>? Function(Name))
instantiate (method: InterfaceType Function({required NullabilitySuffix nullabilitySuffix, required List<DartType> typeArguments}))
lookUpConcreteMethod (method: MethodElement? Function(String, LibraryElement))
lookUpInheritedMethod (method: MethodElement? Function({required LibraryElement library, required String methodName}))
- lookUpInheritedMethod2 (method: MethodElement? Function({required LibraryElement library, required String methodName}), deprecated)
InterfaceFragment (class extends Object implements InstanceFragment):
new (constructor: InterfaceFragment Function())
constructors (getter: List<ConstructorFragment>)
- constructors2 (getter: List<ConstructorFragment>, deprecated)
element (getter: InterfaceElement)
- interfaces (getter: List<InterfaceType>, deprecated)
- mixins (getter: List<InterfaceType>, deprecated)
nextFragment (getter: InterfaceFragment?)
previousFragment (getter: InterfaceFragment?)
- supertype (getter: InterfaceType?, deprecated)
JoinPatternVariableElement (class extends Object implements PatternVariableElement):
new (constructor: JoinPatternVariableElement Function())
firstFragment (getter: JoinPatternVariableFragment)
fragments (getter: List<JoinPatternVariableFragment>)
isConsistent (getter: bool)
variables (getter: List<PatternVariableElement>)
- variables2 (getter: List<PatternVariableElement>, deprecated)
JoinPatternVariableFragment (class extends Object implements PatternVariableFragment):
new (constructor: JoinPatternVariableFragment Function())
element (getter: JoinPatternVariableElement)
@@ -3891,25 +3780,21 @@
LabelElement (class extends Object implements Element):
new (constructor: LabelElement Function())
enclosingElement (getter: ExecutableElement?)
- enclosingElement2 (getter: ExecutableElement?, deprecated)
firstFragment (getter: LabelFragment)
fragments (getter: List<LabelFragment>)
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
LabelFragment (class extends Object implements Fragment):
new (constructor: LabelFragment Function())
element (getter: LabelElement)
nextFragment (getter: LabelFragment?)
previousFragment (getter: LabelFragment?)
- LibraryElement (class extends Object implements Element, Annotatable):
+ LibraryElement (class extends Object implements Element):
new (constructor: LibraryElement Function())
classes (getter: List<ClassElement>)
entryPoint (getter: TopLevelFunctionElement?)
- entryPoint2 (getter: TopLevelFunctionElement?, deprecated)
enums (getter: List<EnumElement>)
exportNamespace (getter: Namespace)
exportedLibraries (getter: List<LibraryElement>)
- exportedLibraries2 (getter: List<LibraryElement>, deprecated)
extensionTypes (getter: List<ExtensionTypeElement>)
extensions (getter: List<ExtensionElement>)
featureSet (getter: FeatureSet)
@@ -3922,9 +3807,7 @@
isInSdk (getter: bool)
languageVersion (getter: LibraryLanguageVersion)
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
loadLibraryFunction (getter: TopLevelFunctionElement)
- loadLibraryFunction2 (getter: TopLevelFunctionElement, deprecated)
mixins (getter: List<MixinElement>)
publicNamespace (getter: Namespace)
session (getter: AnalysisSession)
@@ -3936,14 +3819,11 @@
typeSystem (getter: TypeSystem)
uri (getter: Uri)
getClass (method: ClassElement? Function(String))
- getClass2 (method: ClassElement? Function(String), deprecated)
getEnum (method: EnumElement? Function(String))
- getEnum2 (method: EnumElement? Function(String), deprecated)
getExtension (method: ExtensionElement? Function(String))
getExtensionType (method: ExtensionTypeElement? Function(String))
getGetter (method: GetterElement? Function(String))
getMixin (method: MixinElement? Function(String))
- getMixin2 (method: MixinElement? Function(String), deprecated)
getSetter (method: SetterElement? Function(String))
getTopLevelFunction (method: TopLevelFunctionElement? Function(String))
getTopLevelVariable (method: TopLevelVariableElement? Function(String))
@@ -3953,33 +3833,22 @@
combinators (getter: List<NamespaceCombinator>)
exportKeywordOffset (getter: int)
exportedLibrary (getter: LibraryElement?)
- exportedLibrary2 (getter: LibraryElement?, deprecated)
LibraryFragment (class extends Object implements Fragment):
new (constructor: LibraryFragment Function())
accessibleExtensions (getter: List<ExtensionElement>)
- accessibleExtensions2 (getter: List<ExtensionElement>, deprecated)
classes (getter: List<ClassFragment>)
- classes2 (getter: List<ClassFragment>, deprecated)
element (getter: LibraryElement)
enclosingFragment (getter: LibraryFragment?)
enums (getter: List<EnumFragment>)
- enums2 (getter: List<EnumFragment>, deprecated)
extensionTypes (getter: List<ExtensionTypeFragment>)
- extensionTypes2 (getter: List<ExtensionTypeFragment>, deprecated)
extensions (getter: List<ExtensionFragment>)
- extensions2 (getter: List<ExtensionFragment>, deprecated)
functions (getter: List<TopLevelFunctionFragment>)
- functions2 (getter: List<TopLevelFunctionFragment>, deprecated)
getters (getter: List<GetterFragment>)
importedLibraries (getter: List<LibraryElement>)
- importedLibraries2 (getter: List<LibraryElement>, deprecated)
libraryExports (getter: List<LibraryExport>)
- libraryExports2 (getter: List<LibraryExport>, deprecated)
libraryImports (getter: List<LibraryImport>)
- libraryImports2 (getter: List<LibraryImport>, deprecated)
lineInfo (getter: LineInfo)
mixins (getter: List<MixinFragment>)
- mixins2 (getter: List<MixinFragment>, deprecated)
nextFragment (getter: LibraryFragment?)
offset (getter: int)
partIncludes (getter: List<PartInclude>)
@@ -3989,19 +3858,15 @@
setters (getter: List<SetterFragment>)
source (getter: Source)
topLevelVariables (getter: List<TopLevelVariableFragment>)
- topLevelVariables2 (getter: List<TopLevelVariableFragment>, deprecated)
typeAliases (getter: List<TypeAliasFragment>)
- typeAliases2 (getter: List<TypeAliasFragment>, deprecated)
LibraryImport (class extends Object implements ElementDirective):
new (constructor: LibraryImport Function())
combinators (getter: List<NamespaceCombinator>)
importKeywordOffset (getter: int)
importedLibrary (getter: LibraryElement?)
- importedLibrary2 (getter: LibraryElement?, deprecated)
isSynthetic (getter: bool)
namespace (getter: Namespace)
prefix (getter: PrefixFragment?)
- prefix2 (getter: PrefixFragment?, deprecated)
LibraryLanguageVersion (class extends Object):
new (constructor: LibraryLanguageVersion Function({required Version? override, required Version package}))
effective (getter: Version)
@@ -4021,7 +3886,7 @@
nextFragment (getter: LocalFunctionFragment?)
offset (getter: int)
previousFragment (getter: LocalFunctionFragment?)
- LocalVariableElement (class extends Object implements VariableElement, LocalElement, Annotatable):
+ LocalVariableElement (class extends Object implements VariableElement, LocalElement):
new (constructor: LocalVariableElement Function())
baseElement (getter: LocalVariableElement)
firstFragment (getter: LocalVariableFragment)
@@ -4085,8 +3950,6 @@
isBase (getter: bool)
isImplementableOutside (getter: bool)
superclassConstraints (getter: List<InterfaceType>)
- isImplementableIn (method: bool Function(LibraryElement), deprecated)
- isImplementableIn2 (method: bool Function(LibraryElement), deprecated)
MixinFragment (class extends Object implements InterfaceFragment):
new (constructor: MixinFragment Function())
element (getter: MixinElement)
@@ -4096,7 +3959,6 @@
MultiplyDefinedElement (class extends Object implements Element):
new (constructor: MultiplyDefinedElement Function())
conflictingElements (getter: List<Element>)
- conflictingElements2 (getter: List<Element>, deprecated)
firstFragment (getter: MultiplyDefinedFragment)
fragments (getter: List<MultiplyDefinedFragment>)
MultiplyDefinedFragment (class extends Object implements Fragment):
@@ -4130,23 +3992,19 @@
firstFragment (getter: PatternVariableFragment)
fragments (getter: List<PatternVariableFragment>)
join (getter: JoinPatternVariableElement?)
- join2 (getter: JoinPatternVariableElement?, deprecated)
PatternVariableFragment (class extends Object implements LocalVariableFragment):
new (constructor: PatternVariableFragment Function())
element (getter: PatternVariableElement)
join (getter: JoinPatternVariableFragment?)
- join2 (getter: JoinPatternVariableFragment?, deprecated)
nextFragment (getter: PatternVariableFragment?)
previousFragment (getter: PatternVariableFragment?)
PrefixElement (class extends Object implements Element):
new (constructor: PrefixElement Function())
enclosingElement (getter: Null)
- enclosingElement2 (getter: Null, deprecated)
firstFragment (getter: PrefixFragment)
fragments (getter: List<PrefixFragment>)
imports (getter: List<LibraryImport>)
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
scope (getter: Scope)
PrefixFragment (class extends Object implements Fragment):
new (constructor: PrefixFragment Function())
@@ -4159,28 +4017,23 @@
new (constructor: PropertyAccessorElement Function())
baseElement (getter: PropertyAccessorElement)
enclosingElement (getter: Element)
- enclosingElement2 (getter: Element, deprecated)
firstFragment (getter: PropertyAccessorFragment)
fragments (getter: List<PropertyAccessorFragment>)
variable (getter: PropertyInducingElement)
- variable3 (getter: PropertyInducingElement?, deprecated)
PropertyAccessorFragment (class extends Object implements ExecutableFragment):
new (constructor: PropertyAccessorFragment Function())
element (getter: PropertyAccessorElement)
nextFragment (getter: PropertyAccessorFragment?)
previousFragment (getter: PropertyAccessorFragment?)
- PropertyInducingElement (class extends Object implements VariableElement, Annotatable):
+ PropertyInducingElement (class extends Object implements VariableElement):
new (constructor: PropertyInducingElement Function())
firstFragment (getter: PropertyInducingFragment)
fragments (getter: List<PropertyInducingFragment>)
getter (getter: GetterElement?)
- getter2 (getter: GetterElement?, deprecated)
hasInitializer (getter: bool)
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
setter (getter: SetterElement?)
- setter2 (getter: SetterElement?, deprecated)
- PropertyInducingFragment (class extends Object implements VariableFragment, Annotatable):
+ PropertyInducingFragment (class extends Object implements VariableFragment):
new (constructor: PropertyInducingFragment Function())
element (getter: PropertyInducingElement)
hasInitializer (getter: bool)
@@ -4193,7 +4046,6 @@
new (constructor: SetterElement Function())
baseElement (getter: SetterElement)
correspondingGetter (getter: GetterElement?)
- correspondingGetter2 (getter: GetterElement?, deprecated)
firstFragment (getter: SetterFragment)
fragments (getter: List<SetterFragment>)
SetterFragment (class extends Object implements PropertyAccessorFragment):
@@ -4210,7 +4062,6 @@
firstFragment (getter: SuperFormalParameterFragment)
fragments (getter: List<SuperFormalParameterFragment>)
superConstructorParameter (getter: FormalParameterElement?)
- superConstructorParameter2 (getter: FormalParameterElement?, deprecated)
SuperFormalParameterFragment (class extends Object implements FormalParameterFragment):
new (constructor: SuperFormalParameterFragment Function())
element (getter: SuperFormalParameterElement)
@@ -4241,60 +4092,44 @@
element (getter: TopLevelVariableElement)
nextFragment (getter: TopLevelVariableFragment?)
previousFragment (getter: TopLevelVariableFragment?)
- TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement):
+ TypeAliasElement (class extends Object implements TypeParameterizedElement):
new (constructor: TypeAliasElement Function())
- aliasedElement (getter: Element?, deprecated)
- aliasedElement2 (getter: Element?, deprecated)
aliasedType (getter: DartType)
enclosingElement (getter: LibraryElement)
- enclosingElement2 (getter: LibraryElement, deprecated)
firstFragment (getter: TypeAliasFragment)
fragments (getter: List<TypeAliasFragment>)
instantiate (method: DartType Function({required NullabilitySuffix nullabilitySuffix, required List<DartType> typeArguments}))
- TypeAliasFragment (class extends Object implements TypeParameterizedFragment, TypeDefiningFragment):
+ TypeAliasFragment (class extends Object implements TypeParameterizedFragment):
new (constructor: TypeAliasFragment Function())
element (getter: TypeAliasElement)
enclosingFragment (getter: LibraryFragment?)
nextFragment (getter: Null)
previousFragment (getter: Null)
- TypeDefiningElement (class extends Object implements Element, Annotatable, deprecated):
- new (constructor: TypeDefiningElement Function())
- firstFragment (getter: TypeDefiningFragment)
- fragments (getter: List<TypeDefiningFragment>)
- TypeDefiningFragment (class extends Object implements Fragment, Annotatable, deprecated):
- new (constructor: TypeDefiningFragment Function())
- element (getter: TypeDefiningElement)
- nextFragment (getter: TypeDefiningFragment?)
- offset (getter: int)
- previousFragment (getter: TypeDefiningFragment?)
- TypeParameterElement (class extends Object implements TypeDefiningElement):
+ TypeParameterElement (class extends Object implements Element):
new (constructor: TypeParameterElement Function())
baseElement (getter: TypeParameterElement)
bound (getter: DartType?)
firstFragment (getter: TypeParameterFragment)
fragments (getter: List<TypeParameterFragment>)
instantiate (method: TypeParameterType Function({required NullabilitySuffix nullabilitySuffix}))
- TypeParameterFragment (class extends Object implements TypeDefiningFragment):
+ TypeParameterFragment (class extends Object implements Fragment):
new (constructor: TypeParameterFragment Function())
element (getter: TypeParameterElement)
nextFragment (getter: TypeParameterFragment?)
previousFragment (getter: TypeParameterFragment?)
- TypeParameterizedElement (class extends Object implements Element, Annotatable):
+ TypeParameterizedElement (class extends Object implements Element):
new (constructor: TypeParameterizedElement Function())
firstFragment (getter: TypeParameterizedFragment)
fragments (getter: List<TypeParameterizedFragment>)
isSimplyBounded (getter: bool)
library (getter: LibraryElement)
- library2 (getter: LibraryElement, deprecated)
typeParameters (getter: List<TypeParameterElement>)
- typeParameters2 (getter: List<TypeParameterElement>, deprecated)
- TypeParameterizedFragment (class extends Object implements Fragment, Annotatable):
+ TypeParameterizedFragment (class extends Object implements Fragment):
new (constructor: TypeParameterizedFragment Function())
element (getter: TypeParameterizedElement)
nextFragment (getter: TypeParameterizedFragment?)
previousFragment (getter: TypeParameterizedFragment?)
typeParameters (getter: List<TypeParameterFragment>)
- typeParameters2 (getter: List<TypeParameterFragment>, deprecated)
VariableElement (class extends Object implements Element):
new (constructor: VariableElement Function())
constantInitializer (getter: Expression?)
@@ -4312,169 +4147,6 @@
element (getter: VariableElement)
nextFragment (getter: VariableFragment?)
previousFragment (getter: VariableFragment?)
- BindPatternVariableElement2 (type alias for BindPatternVariableElement, deprecated)
- ClassElement2 (type alias for ClassElement, deprecated)
- ConstructorElement2 (type alias for ConstructorElement, deprecated)
- Element2 (type alias for Element, deprecated)
- EnumElement2 (type alias for EnumElement, deprecated)
- ExecutableElement2 (type alias for ExecutableElement, deprecated)
- ExtensionElement2 (type alias for ExtensionElement, deprecated)
- ExtensionTypeElement2 (type alias for ExtensionTypeElement, deprecated)
- FieldElement2 (type alias for FieldElement, deprecated)
- FieldFormalParameterElement2 (type alias for FieldFormalParameterElement, deprecated)
- FunctionTypedElement2 (type alias for FunctionTypedElement, deprecated)
- GenericFunctionTypeElement2 (type alias for GenericFunctionTypeElement, deprecated)
- InstanceElement2 (type alias for InstanceElement, deprecated)
- InterfaceElement2 (type alias for InterfaceElement, deprecated)
- JoinPatternVariableElement2 (type alias for JoinPatternVariableElement, deprecated)
- LabelElement2 (type alias for LabelElement, deprecated)
- LibraryElement2 (type alias for LibraryElement, deprecated)
- LocalElement2 (type alias for LocalElement, deprecated)
- LocalVariableElement2 (type alias for LocalVariableElement, deprecated)
- MethodElement2 (type alias for MethodElement, deprecated)
- MixinElement2 (type alias for MixinElement, deprecated)
- MultiplyDefinedElement2 (type alias for MultiplyDefinedElement, deprecated)
- PatternVariableElement2 (type alias for PatternVariableElement, deprecated)
- PrefixElement2 (type alias for PrefixElement, deprecated)
- PropertyAccessorElement2 (type alias for PropertyAccessorElement, deprecated)
- PropertyInducingElement2 (type alias for PropertyInducingElement, deprecated)
- SuperFormalParameterElement2 (type alias for SuperFormalParameterElement, deprecated)
- TopLevelVariableElement2 (type alias for TopLevelVariableElement, deprecated)
- TypeAliasElement2 (type alias for TypeAliasElement, deprecated)
- TypeDefiningElement2 (type alias for TypeDefiningElement, deprecated)
- TypeParameterElement2 (type alias for TypeParameterElement, deprecated)
- TypeParameterizedElement2 (type alias for TypeParameterizedElement, deprecated)
- VariableElement2 (type alias for VariableElement, deprecated)
-package:analyzer/dart/element/element2.dart:
- Annotatable (see above)
- BindPatternVariableElement (see above)
- BindPatternVariableFragment (see above)
- ClassElement (see above)
- ClassFragment (see above)
- ConstructorElement (see above)
- ConstructorFragment (see above)
- DirectiveUri (see above)
- DirectiveUriWithLibrary (see above)
- DirectiveUriWithRelativeUri (see above)
- DirectiveUriWithRelativeUriString (see above)
- DirectiveUriWithSource (see above)
- DirectiveUriWithUnit (see above)
- Element (see above)
- ElementAnnotation (see above)
- ElementDirective (see above)
- ElementKind (see above)
- ElementVisitor2 (see above)
- EnumElement (see above)
- EnumFragment (see above)
- ExecutableElement (see above)
- ExecutableFragment (see above)
- ExtensionElement (see above)
- ExtensionFragment (see above)
- ExtensionTypeElement (see above)
- ExtensionTypeFragment (see above)
- FieldElement (see above)
- FieldFormalParameterElement (see above)
- FieldFormalParameterFragment (see above)
- FieldFragment (see above)
- FormalParameterElement (see above)
- FormalParameterFragment (see above)
- Fragment (see above)
- FunctionTypedElement (see above)
- FunctionTypedFragment (see above)
- GenericFunctionTypeElement (see above)
- GenericFunctionTypeFragment (see above)
- GetterElement (see above)
- GetterFragment (see above)
- HideElementCombinator (see above)
- InstanceElement (see above)
- InstanceFragment (see above)
- InterfaceElement (see above)
- InterfaceFragment (see above)
- JoinPatternVariableElement (see above)
- JoinPatternVariableFragment (see above)
- LabelElement (see above)
- LabelFragment (see above)
- LibraryElement (see above)
- LibraryExport (see above)
- LibraryFragment (see above)
- LibraryImport (see above)
- LibraryLanguageVersion (see above)
- LocalElement (see above)
- LocalFragment (see above)
- LocalFunctionElement (see above)
- LocalFunctionFragment (see above)
- LocalVariableElement (see above)
- LocalVariableFragment (see above)
- Metadata (see above)
- MethodElement (see above)
- MethodFragment (see above)
- MixinElement (see above)
- MixinFragment (see above)
- MultiplyDefinedElement (see above)
- MultiplyDefinedFragment (see above)
- Name (see above)
- NamespaceCombinator (see above)
- PartInclude (see above)
- PatternVariableElement (see above)
- PatternVariableFragment (see above)
- PrefixElement (see above)
- PrefixFragment (see above)
- PropertyAccessorElement (see above)
- PropertyAccessorFragment (see above)
- PropertyInducingElement (see above)
- PropertyInducingFragment (see above)
- SetterElement (see above)
- SetterFragment (see above)
- ShowElementCombinator (see above)
- SuperFormalParameterElement (see above)
- SuperFormalParameterFragment (see above)
- TopLevelFunctionElement (see above)
- TopLevelFunctionFragment (see above)
- TopLevelVariableElement (see above)
- TopLevelVariableFragment (see above)
- TypeAliasElement (see above)
- TypeAliasFragment (see above)
- TypeDefiningElement (see above)
- TypeDefiningFragment (see above)
- TypeParameterElement (see above)
- TypeParameterFragment (see above)
- TypeParameterizedElement (see above)
- TypeParameterizedFragment (see above)
- VariableElement (see above)
- VariableFragment (see above)
- BindPatternVariableElement2 (see above)
- ClassElement2 (see above)
- ConstructorElement2 (see above)
- Element2 (see above)
- EnumElement2 (see above)
- ExecutableElement2 (see above)
- ExtensionElement2 (see above)
- ExtensionTypeElement2 (see above)
- FieldElement2 (see above)
- FieldFormalParameterElement2 (see above)
- FunctionTypedElement2 (see above)
- GenericFunctionTypeElement2 (see above)
- InstanceElement2 (see above)
- InterfaceElement2 (see above)
- JoinPatternVariableElement2 (see above)
- LabelElement2 (see above)
- LibraryElement2 (see above)
- LocalElement2 (see above)
- LocalVariableElement2 (see above)
- MethodElement2 (see above)
- MixinElement2 (see above)
- MultiplyDefinedElement2 (see above)
- PatternVariableElement2 (see above)
- PrefixElement2 (see above)
- PropertyAccessorElement2 (see above)
- PropertyInducingElement2 (see above)
- SuperFormalParameterElement2 (see above)
- TopLevelVariableElement2 (see above)
- TypeAliasElement2 (see above)
- TypeDefiningElement2 (see above)
- TypeParameterElement2 (see above)
- TypeParameterizedElement2 (see above)
- VariableElement2 (see above)
package:analyzer/dart/element/nullability_suffix.dart:
NullabilitySuffix (enum):
none (static getter: NullabilitySuffix)
@@ -4488,15 +4160,12 @@
ScopeLookupResult (class extends Object):
new (constructor: ScopeLookupResult Function())
getter (getter: Element?)
- getter2 (getter: Element?, deprecated)
setter (getter: Element?)
- setter2 (getter: Element?, deprecated)
package:analyzer/dart/element/type.dart:
DartType (class extends Object):
new (constructor: DartType Function())
alias (getter: InstantiatedTypeAliasElement?)
element (getter: Element?)
- element3 (getter: Element?, deprecated)
extensionTypeErasure (getter: DartType)
isBottom (getter: bool)
isDartAsyncFuture (getter: bool)
@@ -4523,14 +4192,12 @@
accept (method: R Function<R>(TypeVisitor<R>))
acceptWithArgument (method: R Function<R, A>(TypeVisitorWithArgument<R, A>, A))
asInstanceOf (method: InterfaceType? Function(InterfaceElement))
- asInstanceOf2 (method: InterfaceType? Function(InterfaceElement), deprecated)
getDisplayString (method: String Function({deprecated bool withNullability}))
DynamicType (class extends Object implements DartType):
new (constructor: DynamicType Function())
FunctionType (class extends Object implements DartType):
new (constructor: FunctionType Function())
element (getter: Null)
- element3 (getter: Null, deprecated)
formalParameters (getter: List<FormalParameterElement>)
namedParameterTypes (getter: Map<String, DartType>)
normalParameterTypes (getter: List<DartType>)
@@ -4541,37 +4208,26 @@
InstantiatedTypeAliasElement (class extends Object):
new (constructor: InstantiatedTypeAliasElement Function())
element (getter: TypeAliasElement)
- element2 (getter: TypeAliasElement, deprecated)
typeArguments (getter: List<DartType>)
InterfaceType (class extends Object implements ParameterizedType):
new (constructor: InterfaceType Function())
allSupertypes (getter: List<InterfaceType>)
constructors (getter: List<ConstructorElement>)
- constructors2 (getter: List<ConstructorElement>, deprecated)
element (getter: InterfaceElement)
- element3 (getter: InterfaceElement, deprecated)
getters (getter: List<GetterElement>)
interfaces (getter: List<InterfaceType>)
methods (getter: List<MethodElement>)
- methods2 (getter: List<MethodElement>, deprecated)
mixins (getter: List<InterfaceType>)
setters (getter: List<SetterElement>)
superclass (getter: InterfaceType?)
superclassConstraints (getter: List<InterfaceType>)
getGetter (method: GetterElement? Function(String))
- getGetter2 (method: GetterElement? Function(String), deprecated)
getMethod (method: MethodElement? Function(String))
- getMethod2 (method: MethodElement? Function(String), deprecated)
getSetter (method: SetterElement? Function(String))
- getSetter2 (method: SetterElement? Function(String), deprecated)
lookUpConstructor (method: ConstructorElement? Function(String?, LibraryElement))
- lookUpConstructor2 (method: ConstructorElement? Function(String?, LibraryElement), deprecated)
lookUpGetter (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
- lookUpGetter3 (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
lookUpMethod (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
- lookUpMethod3 (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
lookUpSetter (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
- lookUpSetter3 (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
InvalidType (class extends Object implements DartType):
new (constructor: InvalidType Function())
NeverType (class extends Object implements DartType):
@@ -4582,7 +4238,6 @@
RecordType (class extends Object implements DartType):
new (constructor: RecordType Function({required Map<String, DartType> named, required NullabilitySuffix nullabilitySuffix, required List<DartType> positional}))
element (getter: Null)
- element3 (getter: Null, deprecated)
namedFields (getter: List<RecordTypeNamedField>)
positionalFields (getter: List<RecordTypePositionalField>)
RecordTypeField (class extends Object):
@@ -4597,78 +4252,58 @@
new (constructor: TypeParameterType Function())
bound (getter: DartType)
element (getter: TypeParameterElement)
- element3 (getter: TypeParameterElement, deprecated)
VoidType (class extends Object implements DartType):
new (constructor: VoidType Function())
element (getter: Null)
- element3 (getter: Null, deprecated)
package:analyzer/dart/element/type_provider.dart:
TypeProvider (class extends Object):
new (constructor: TypeProvider Function())
boolElement (getter: ClassElement)
- boolElement2 (getter: ClassElement, deprecated)
boolType (getter: InterfaceType)
bottomType (getter: DartType)
deprecatedType (getter: InterfaceType)
doubleElement (getter: ClassElement)
- doubleElement2 (getter: ClassElement, deprecated)
doubleType (getter: InterfaceType)
dynamicType (getter: DartType)
enumElement (getter: ClassElement?)
- enumElement2 (getter: ClassElement?, deprecated)
enumType (getter: InterfaceType?)
functionType (getter: InterfaceType)
futureDynamicType (getter: InterfaceType)
futureElement (getter: ClassElement)
- futureElement2 (getter: ClassElement, deprecated)
futureNullType (getter: InterfaceType)
futureOrElement (getter: ClassElement)
- futureOrElement2 (getter: ClassElement, deprecated)
futureOrNullType (getter: InterfaceType)
intElement (getter: ClassElement)
- intElement2 (getter: ClassElement, deprecated)
intType (getter: InterfaceType)
iterableDynamicType (getter: InterfaceType)
iterableElement (getter: ClassElement)
- iterableElement2 (getter: ClassElement, deprecated)
iterableObjectType (getter: InterfaceType)
listElement (getter: ClassElement)
- listElement2 (getter: ClassElement, deprecated)
mapElement (getter: ClassElement)
- mapElement2 (getter: ClassElement, deprecated)
mapObjectObjectType (getter: InterfaceType)
neverType (getter: NeverType)
nullElement (getter: ClassElement)
- nullElement2 (getter: ClassElement, deprecated)
nullType (getter: InterfaceType)
numElement (getter: ClassElement)
- numElement2 (getter: ClassElement, deprecated)
numType (getter: InterfaceType)
objectElement (getter: ClassElement)
- objectElement2 (getter: ClassElement, deprecated)
objectQuestionType (getter: InterfaceType)
objectType (getter: InterfaceType)
recordElement (getter: ClassElement)
- recordElement2 (getter: ClassElement, deprecated)
recordType (getter: InterfaceType)
setElement (getter: ClassElement)
- setElement2 (getter: ClassElement, deprecated)
stackTraceType (getter: InterfaceType)
streamDynamicType (getter: InterfaceType)
streamElement (getter: ClassElement)
- streamElement2 (getter: ClassElement, deprecated)
stringElement (getter: ClassElement)
- stringElement2 (getter: ClassElement, deprecated)
stringType (getter: InterfaceType)
symbolElement (getter: ClassElement)
- symbolElement2 (getter: ClassElement, deprecated)
symbolType (getter: InterfaceType)
typeType (getter: InterfaceType)
voidType (getter: VoidType)
futureOrType (method: InterfaceType Function(DartType))
futureType (method: InterfaceType Function(DartType))
isNonSubtypableClass (method: bool Function(InterfaceElement))
- isNonSubtypableClass2 (method: bool Function(InterfaceElement), deprecated)
isObjectGetter (method: bool Function(String))
isObjectMember (method: bool Function(String))
isObjectMethod (method: bool Function(String))
@@ -4683,9 +4318,7 @@
flatten (method: DartType Function(DartType))
greatestLowerBound (method: DartType Function(DartType, DartType))
instantiateInterfaceToBounds (method: InterfaceType Function({required InterfaceElement element, required NullabilitySuffix nullabilitySuffix}))
- instantiateInterfaceToBounds2 (method: InterfaceType Function({required InterfaceElement element, required NullabilitySuffix nullabilitySuffix}), deprecated)
instantiateTypeAliasToBounds (method: DartType Function({required TypeAliasElement element, required NullabilitySuffix nullabilitySuffix}))
- instantiateTypeAliasToBounds2 (method: DartType Function({required TypeAliasElement element, required NullabilitySuffix nullabilitySuffix}), deprecated)
isAssignableTo (method: bool Function(DartType, DartType, {bool strictCasts}))
isNonNullable (method: bool Function(DartType))
isNullable (method: bool Function(DartType))
@@ -4853,12 +4486,11 @@
buildSdkSummary (function: Future<Uint8List> Function({String? embedderYamlPath, required ResourceProvider resourceProvider, required String sdkPath}))
package:analyzer/diagnostic/diagnostic.dart:
Diagnostic (class extends Object):
- forValues (constructor: Diagnostic Function({List<DiagnosticMessage> contextMessages, String? correctionMessage, deprecated Object? data, DiagnosticCode? diagnosticCode, deprecated DiagnosticCode? errorCode, required int length, required String message, required int offset, required Source source}))
- tmp (constructor: Diagnostic Function({List<Object?> arguments, List<DiagnosticMessage> contextMessages, deprecated Object? data, DiagnosticCode? diagnosticCode, deprecated DiagnosticCode? errorCode, required int length, required int offset, required Source source}))
+ forValues (constructor: Diagnostic Function({List<DiagnosticMessage> contextMessages, String? correctionMessage, required DiagnosticCode diagnosticCode, required int length, required String message, required int offset, required Source source}))
+ tmp (constructor: Diagnostic Function({List<Object?> arguments, List<DiagnosticMessage> contextMessages, required DiagnosticCode diagnosticCode, required int length, required int offset, required Source source}))
contextMessages (getter: List<DiagnosticMessage>)
correction (getter: String?, deprecated)
correctionMessage (getter: String?)
- data (getter: Object?)
diagnosticCode (getter: DiagnosticCode)
errorCode (getter: DiagnosticCode, deprecated)
hashCode (getter: int)
@@ -4946,7 +4578,6 @@
ErrorType (type alias for DiagnosticType, deprecated)
package:analyzer/error/listener.dart:
AnalysisErrorListener (class extends Object implements DiagnosticOrErrorListener, deprecated):
- NULL_LISTENER (static getter: AnalysisErrorListener)
new (constructor: AnalysisErrorListener Function())
onError (method: void Function(Diagnostic))
BooleanDiagnosticListener (class extends Object implements AnalysisErrorListener, DiagnosticListener):
@@ -4964,13 +4595,13 @@
lockLevel (getter: int)
lockLevel= (setter: int)
source (getter: Source)
- atConstructorDeclaration (method: Diagnostic Function(ConstructorDeclaration, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
- atElement2 (method: Diagnostic Function(Element, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
- atEntity (method: Diagnostic Function(SyntacticEntity, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
- atNode (method: Diagnostic Function(AstNode, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
- atOffset (method: Diagnostic Function({List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data, DiagnosticCode? diagnosticCode, deprecated DiagnosticCode? errorCode, required int length, required int offset}))
- atSourceSpan (method: Diagnostic Function(SourceSpan, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
- atToken (method: Diagnostic Function(Token, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, deprecated Object? data}))
+ atConstructorDeclaration (method: Diagnostic Function(ConstructorDeclaration, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
+ atElement2 (method: Diagnostic Function(Element, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
+ atEntity (method: Diagnostic Function(SyntacticEntity, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
+ atNode (method: Diagnostic Function(AstNode, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
+ atOffset (method: Diagnostic Function({List<Object>? arguments, List<DiagnosticMessage>? contextMessages, required DiagnosticCode diagnosticCode, required int length, required int offset}))
+ atSourceSpan (method: Diagnostic Function(SourceSpan, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
+ atToken (method: Diagnostic Function(Token, DiagnosticCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages}))
reportError (method: void Function(Diagnostic))
RecordingDiagnosticListener (class extends Object implements AnalysisErrorListener, DiagnosticListener):
new (constructor: RecordingDiagnosticListener Function())
@@ -4981,9 +4612,7 @@
onError (method: void Function(Diagnostic))
DiagnosticOrErrorListenerExtension (extension on DiagnosticOrErrorListener):
onDiagnostic (method: void Function(Diagnostic))
- BooleanErrorListener (type alias for BooleanDiagnosticListener, deprecated)
ErrorReporter (type alias for DiagnosticReporter, deprecated)
- RecorderingErrorListener (type alias for RecordingDiagnosticListener, deprecated)
package:analyzer/exception/exception.dart:
AnalysisException (class extends Object implements Exception):
new (constructor: AnalysisException Function([String, CaughtException?]))
@@ -5344,9 +4973,6 @@
RuleConfig (non-public)
package:analyzer/src/workspace/workspace.dart:
Workspace (non-public)
-package:analyzer/utilities/extensions/ast.dart:
- AstNodeExtension (extension on AstNode, deprecated):
- nodeCovering (method: AstNode? Function({int length, required int offset}), deprecated)
package:analyzer/utilities/extensions/element.dart:
LibraryElement2Extension (extension on LibraryElement):
exportedExtensions (getter: Iterable<ExtensionElement>)
diff --git a/pkg/analyzer/lib/dart/analysis/results.dart b/pkg/analyzer/lib/dart/analysis/results.dart
index 5575659..283819c 100644
--- a/pkg/analyzer/lib/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/dart/analysis/results.dart
@@ -60,26 +60,6 @@
SomeResolvedUnitResult,
SomeUnitElementResult {}
-/// The declaration of an [Element].
-@Deprecated('Use FragmentDeclarationResult instead')
-abstract class ElementDeclarationResult {
- /// The [Fragment] that this object describes.
- Fragment get fragment;
-
- /// The node that declares the [Element]. Depending on whether it is returned
- /// from [ResolvedLibraryResult] or [ParsedLibraryResult] it might be resolved
- /// or just parsed.
- AstNode get node;
-
- /// If this declaration is returned from [ParsedLibraryResult], the parsed
- /// unit that contains the [node]. Otherwise `null`.
- ParsedUnitResult? get parsedUnit;
-
- /// If this declaration is returned from [ResolvedLibraryResult], the
- /// resolved unit that contains the [node]. Otherwise `null`.
- ResolvedUnitResult? get resolvedUnit;
-}
-
/// The result of computing all of the errors contained in a single file, both
/// syntactic and semantic.
///
@@ -169,10 +149,6 @@
abstract class LibraryElementResult implements SomeLibraryElementResult {
/// The element representing the library.
LibraryElement get element;
-
- /// The element representing the library.
- @Deprecated('Use element instead')
- LibraryElement get element2;
}
/// The type of [InvalidResult] returned when Dart SDK does not have a
@@ -242,14 +218,6 @@
/// Returns `null` if the [fragment] is synthetic.
///
/// Throws [ArgumentError] if the [fragment] is not defined in this library.
- @Deprecated('Use getFragmentDeclaration() instead')
- ElementDeclarationResult? getElementDeclaration2(Fragment fragment);
-
- /// Returns the declaration of the [fragment].
- ///
- /// Returns `null` if the [fragment] is synthetic.
- ///
- /// Throws [ArgumentError] if the [fragment] is not defined in this library.
FragmentDeclarationResult? getFragmentDeclaration(Fragment fragment);
}
@@ -292,10 +260,6 @@
/// The element representing this library.
LibraryElement get element;
- /// The element representing this library.
- @Deprecated('Use element instead')
- LibraryElement get element2;
-
/// The type provider used when resolving the library.
TypeProvider get typeProvider;
@@ -320,10 +284,6 @@
/// The element representing the library containing the compilation [unit].
LibraryElement get libraryElement;
- /// The element representing the library containing the compilation [unit].
- @Deprecated('Use libraryElement instead')
- LibraryElement get libraryElement2;
-
/// The fragment corresponding to the [unit].
LibraryFragment get libraryFragment;
diff --git a/pkg/analyzer/lib/dart/analysis/session.dart b/pkg/analyzer/lib/dart/analysis/session.dart
index 52c95ca..dba81c6 100644
--- a/pkg/analyzer/lib/dart/analysis/session.dart
+++ b/pkg/analyzer/lib/dart/analysis/session.dart
@@ -53,11 +53,6 @@
/// with the given library [element].
SomeParsedLibraryResult getParsedLibraryByElement(LibraryElement element);
- /// Return information about the results of parsing units of the library file
- /// with the given library [element].
- @Deprecated('Use getParsedLibraryByElement instead')
- SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement element);
-
/// Return information about the results of parsing the file with the given
/// absolute, normalized [path].
SomeParsedUnitResult getParsedUnit(String path);
@@ -76,15 +71,6 @@
);
/// Return a future that will complete with information about the results of
- /// resolving all of the files in the library with the library [element].
- ///
- /// Throw [ArgumentError] if the [element] was not produced by this session.
- @Deprecated('Use getResolvedLibraryByElement instead')
- Future<SomeResolvedLibraryResult> getResolvedLibraryByElement2(
- LibraryElement element,
- );
-
- /// Return a future that will complete with information about the results of
/// resolving all of the files in the library containing the given absolute,
/// normalized [path].
///
diff --git a/pkg/analyzer/lib/dart/ast/ast.dart b/pkg/analyzer/lib/dart/ast/ast.dart
index 71665a3..20506a5 100644
--- a/pkg/analyzer/lib/dart/ast/ast.dart
+++ b/pkg/analyzer/lib/dart/ast/ast.dart
@@ -189,8 +189,6 @@
NullAwareElement,
NullCheckPattern,
NullLiteral,
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
ObjectPattern,
ParenthesizedExpression,
ParenthesizedPattern,
diff --git a/pkg/analyzer/lib/dart/constant/value.dart b/pkg/analyzer/lib/dart/constant/value.dart
index 3131dc2..17c7dc9 100644
--- a/pkg/analyzer/lib/dart/constant/value.dart
+++ b/pkg/analyzer/lib/dart/constant/value.dart
@@ -20,10 +20,6 @@
/// The constructor that was called.
ConstructorElement get constructor;
- /// The constructor that was called.
- @Deprecated('Use constructor instead')
- ConstructorElement get constructor2;
-
/// The values of named arguments.
Map<String, DartObject> get namedArguments;
@@ -89,10 +85,6 @@
/// If this object is the value of a constant variable, the variable.
VariableElement? get variable;
- /// If this object is the value of a constant variable, the variable.
- @Deprecated('Use variable instead')
- VariableElement? get variable2;
-
/// Return a representation of the value of the field with the given [name].
///
/// Return `null` if either the object being represented does not have a field
@@ -126,15 +118,6 @@
/// * the value of the object being represented is `null`.
ExecutableElement? toFunctionValue();
- /// Return an element corresponding to the value of the object being
- /// represented, or `null`
- /// if
- /// * this object is not of a function type,
- /// * the value of the object being represented is not known, or
- /// * the value of the object being represented is `null`.
- @Deprecated('Use toFunctionValue instead')
- ExecutableElement? toFunctionValue2();
-
/// Return an integer corresponding to the value of the object being
/// represented, or `null` if
/// * this object is not of type 'int',
diff --git a/pkg/analyzer/lib/dart/element/element.dart b/pkg/analyzer/lib/dart/element/element.dart
index e3a1364..8d8e451 100644
--- a/pkg/analyzer/lib/dart/element/element.dart
+++ b/pkg/analyzer/lib/dart/element/element.dart
@@ -63,138 +63,6 @@
export 'package:analyzer/src/dart/element/inheritance_manager3.dart' show Name;
-@Deprecated('Use BindPatternVariableElement instead')
-typedef BindPatternVariableElement2 = BindPatternVariableElement;
-
-@Deprecated('Use ClassElement instead')
-typedef ClassElement2 = ClassElement;
-
-@Deprecated('Use ConstructorElement instead')
-typedef ConstructorElement2 = ConstructorElement;
-
-@Deprecated('Use Element instead')
-typedef Element2 = Element;
-
-@Deprecated('Use EnumElement instead')
-typedef EnumElement2 = EnumElement;
-
-@Deprecated('Use ExecutableElement instead')
-typedef ExecutableElement2 = ExecutableElement;
-
-@Deprecated('Use ExtensionElement instead')
-typedef ExtensionElement2 = ExtensionElement;
-
-@Deprecated('Use ExtensionTypeElement instead')
-typedef ExtensionTypeElement2 = ExtensionTypeElement;
-
-@Deprecated('Use FieldElement instead')
-typedef FieldElement2 = FieldElement;
-
-@Deprecated('Use FormalParameterElement instead')
-typedef FieldFormalParameterElement2 = FieldFormalParameterElement;
-
-@Deprecated('Use FunctionTypedElement instead')
-typedef FunctionTypedElement2 = FunctionTypedElement;
-
-@Deprecated('Use GenericFunctionTypeElement instead')
-typedef GenericFunctionTypeElement2 = GenericFunctionTypeElement;
-
-@Deprecated('Use InstanceElement instead')
-typedef InstanceElement2 = InstanceElement;
-
-@Deprecated('Use InterfaceElement instead')
-typedef InterfaceElement2 = InterfaceElement;
-
-@Deprecated('Use JoinPatternVariableElement instead')
-typedef JoinPatternVariableElement2 = JoinPatternVariableElement;
-
-@Deprecated('Use LabelElement instead')
-typedef LabelElement2 = LabelElement;
-
-@Deprecated('Use LibraryElement instead')
-typedef LibraryElement2 = LibraryElement;
-
-@Deprecated('Use LocalElement instead')
-typedef LocalElement2 = LocalElement;
-
-@Deprecated('Use LocalVariableElement instead')
-typedef LocalVariableElement2 = LocalVariableElement;
-
-@Deprecated('Use MethodElement instead')
-typedef MethodElement2 = MethodElement;
-
-@Deprecated('Use MixinElement instead')
-typedef MixinElement2 = MixinElement;
-
-@Deprecated('Use MultiplyDefinedElement instead')
-typedef MultiplyDefinedElement2 = MultiplyDefinedElement;
-
-@Deprecated('Use PatternVariableElement instead')
-typedef PatternVariableElement2 = PatternVariableElement;
-
-@Deprecated('Use PrefixElement instead')
-typedef PrefixElement2 = PrefixElement;
-
-@Deprecated('Use PropertyAccessorElement instead')
-typedef PropertyAccessorElement2 = PropertyAccessorElement;
-
-@Deprecated('Use PropertyInducingElement instead')
-typedef PropertyInducingElement2 = PropertyInducingElement;
-
-@Deprecated('Use SuperFormalParameterElement instead')
-typedef SuperFormalParameterElement2 = SuperFormalParameterElement;
-
-@Deprecated('Use TopLevelVariableElement instead')
-typedef TopLevelVariableElement2 = TopLevelVariableElement;
-
-@Deprecated('Use TypeAliasElement instead')
-typedef TypeAliasElement2 = TypeAliasElement;
-
-@Deprecated('Use TypeDefiningElement instead')
-typedef TypeDefiningElement2 = TypeDefiningElement;
-
-@Deprecated('Use TypeParameterElement instead')
-typedef TypeParameterElement2 = TypeParameterElement;
-
-@Deprecated('Use TypeParameterizedElement instead')
-typedef TypeParameterizedElement2 = TypeParameterizedElement;
-
-@Deprecated('Use VariableElement instead')
-typedef VariableElement2 = VariableElement;
-
-/// An element or fragment that can have either annotations (metadata), a
-/// documentation comment, or both associated with it.
-@Deprecated('Use Element or Fragment directly instead')
-abstract class Annotatable {
- /// The content of the documentation comment (including delimiters) for this
- /// element or fragment.
- ///
- /// If the receiver is an element that has fragments, the comment will be a
- /// concatenation of the comments from all of the fragments.
- ///
- /// Returns `null` if the receiver doesn't have documentation.
- String? get documentationComment;
-
- /// The metadata associated with the element or fragment.
- ///
- /// If the receiver is an element that has fragments, the list will include
- /// all of the metadata from all of the fragments.
- ///
- /// The list will be empty if the receiver does not have any metadata or if
- /// the library containing this element has not yet been fully resolved.
- Metadata get metadata;
-
- /// The metadata associated with the element or fragment.
- ///
- /// If the receiver is an element that has fragments, the list will include
- /// all of the metadata from all of the fragments.
- ///
- /// The list will be empty if the receiver does not have any metadata or if
- /// the library containing this element has not yet been fully resolved.
- @Deprecated('Use metadata instead')
- Metadata get metadata2;
-}
-
/// A pattern variable that is explicitly declared.
///
/// Clients may not extend, implement or mix-in this class.
@@ -321,36 +189,6 @@
/// from a class whose superclass is not Object.
/// </blockquote>
bool get isValidMixin;
-
- /// Whether the class, assuming that it is within scope, can be extended in
- /// the given [library].
- @Deprecated('Use isExtendableOutside instead')
- bool isExtendableIn(LibraryElement library);
-
- /// Whether the class, assuming that it is within scope, can be extended in
- /// the given [library].
- @Deprecated('Use isExtendableOutside instead')
- bool isExtendableIn2(LibraryElement library);
-
- /// Whether the class, assuming that it is within scope, can be implemented in
- /// the given [library].
- @Deprecated('Use isImplementableOutside instead')
- bool isImplementableIn(LibraryElement library);
-
- /// Whether the class, assuming that it is within scope, can be implemented in
- /// the given [library].
- @Deprecated('Use isImplementableOutside instead')
- bool isImplementableIn2(LibraryElement library);
-
- /// Whether the class, assuming that it is within scope, can be mixed-in in
- /// the given [library].
- @Deprecated('Use isMixableOutside instead')
- bool isMixableIn(LibraryElement library);
-
- /// Whether the class, assuming that it is within scope, can be mixed-in in
- /// the given [library].
- @Deprecated('Use isMixableOutside instead')
- bool isMixableIn2(LibraryElement library);
}
/// The portion of a [ClassElement] contributed by a single declaration.
@@ -381,10 +219,6 @@
@override
InterfaceElement get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- InterfaceElement get enclosingElement2;
-
@override
ConstructorFragment get firstFragment;
@@ -410,13 +244,6 @@
@override
String? get name;
- /// The name of this constructor.
- ///
- /// The name of the unnamed constructor is `new`.
- @Deprecated('Use name instead')
- @override
- String? get name3;
-
/// The constructor to which this constructor is redirecting.
///
/// Returns `null` if this constructor does not redirect to another
@@ -424,14 +251,6 @@
/// resolved.
ConstructorElement? get redirectedConstructor;
- /// The constructor to which this constructor is redirecting.
- ///
- /// Returns `null` if this constructor does not redirect to another
- /// constructor or if the library containing this constructor has not yet been
- /// resolved.
- @Deprecated('Use redirectedConstructor instead')
- ConstructorElement? get redirectedConstructor2;
-
@override
InterfaceType get returnType;
@@ -439,12 +258,6 @@
/// `null` if this constructor redirects to another constructor, or if the
/// library containing this constructor has not yet been resolved.
ConstructorElement? get superConstructor;
-
- /// The constructor of the superclass that this constructor invokes, or
- /// `null` if this constructor redirects to another constructor, or if the
- /// library containing this constructor has not yet been resolved.
- @Deprecated('Use superConstructor instead')
- ConstructorElement? get superConstructor2;
}
/// The portion of a [ConstructorElement] contributed by a single declaration.
@@ -460,10 +273,6 @@
@override
String get name;
- @Deprecated('Use name instead')
- @override
- String get name2;
-
@override
ConstructorFragment? get nextFragment;
@@ -515,10 +324,6 @@
abstract class DirectiveUriWithLibrary extends DirectiveUriWithSource {
/// The library referenced by the [source].
LibraryElement get library;
-
- /// The library referenced by the [source].
- @Deprecated('Use library instead')
- LibraryElement get library2;
}
/// [DirectiveUriWithRelativeUriString] that can be parsed into a relative URI.
@@ -596,13 +401,6 @@
/// In particular, they are not guaranteed to be in lexical order.
List<Element> get children;
- /// The children of this element.
- ///
- /// There is no guarantee of the order in which the children will be returned.
- /// In particular, they are not guaranteed to be in lexical order.
- @Deprecated('Use children instead')
- List<Element> get children2;
-
/// The display name of this element, or an empty string if the element does
/// not have a name.
///
@@ -625,13 +423,6 @@
/// top-level elements in the model.
Element? get enclosingElement;
- /// The element that either physically or logically encloses this element.
- ///
- /// Returns `null` if this element is a library because libraries are the
- /// top-level elements in the model.
- @Deprecated('Use enclosingElement instead')
- Element? get enclosingElement2;
-
/// The first fragment in the chain of fragments that are merged to make this
/// element.
///
@@ -674,14 +465,6 @@
/// in a single library.
LibraryElement? get library;
- /// Library that contains this element.
- ///
- /// This will be the element itself if it's a library element. This will be
- /// `null` if this element is a [MultiplyDefinedElement] that isn't contained
- /// in a single library.
- @Deprecated('Use library instead')
- LibraryElement? get library2;
-
/// The name to use for lookup in maps.
///
/// It is usually the same as [name], with a few special cases.
@@ -709,14 +492,6 @@
/// See [Fragment.name] for details.
String? get name;
- /// The name of this element.
- ///
- /// Returns `null` if this element doesn't have a name.
- ///
- /// See [Fragment.name] for details.
- @Deprecated('Use name instead')
- String? get name3;
-
/// The non-synthetic element that caused this element to be created.
///
/// If this element is not synthetic, then the element itself is returned.
@@ -727,17 +502,6 @@
/// the enclosing class is returned.
Element get nonSynthetic;
- /// The non-synthetic element that caused this element to be created.
- ///
- /// If this element is not synthetic, then the element itself is returned.
- ///
- /// If this element is synthetic, then the corresponding non-synthetic
- /// element is returned. For example, for a synthetic getter of a
- /// non-synthetic field the field is returned; for a synthetic constructor
- /// the enclosing class is returned.
- @Deprecated('Use nonSynthetic instead')
- Element get nonSynthetic2;
-
/// The analysis session in which this element is defined.
AnalysisSession? get session;
@@ -764,13 +528,6 @@
/// element.
T? accept<T>(ElementVisitor2<T> visitor);
- /// Uses the given [visitor] to visit this element.
- ///
- /// Returns the value returned by the visitor as a result of visiting this
- /// element.
- @Deprecated('Use accept instead')
- T? accept2<T>(ElementVisitor2<T> visitor);
-
/// The presentation of this element as it should appear when presented to
/// users.
///
@@ -786,35 +543,12 @@
/// be changed if doing so would improve the UX.
String displayString({bool multiline = false, bool preferTypeAlias = false});
- /// The presentation of this element as it should appear when presented to
- /// users.
- ///
- /// If [multiline] is `true`, then the string may be wrapped over multiple
- /// lines with newlines to improve formatting. For example, function
- /// signatures may be formatted as if they had trailing commas.
- ///
- /// If [preferTypeAlias] is `true` and the element represents a type defined
- /// by a type alias, then the name of the type alias will be used in the
- /// returned string rather than the name of the type being aliased.
- ///
- /// Clients should not depend on the content of the returned value as it will
- /// be changed if doing so would improve the UX.
- @Deprecated('Use displayString instead')
- String displayString2({bool multiline = false, bool preferTypeAlias = false});
-
/// Returns a display name for the given element that includes the path to the
/// compilation unit in which the type is defined. If [shortName] is `null`
/// then [displayName] will be used as the name of this element. Otherwise
/// the provided name will be used.
String getExtendedDisplayName({String? shortName});
- /// Returns a display name for the given element that includes the path to the
- /// compilation unit in which the type is defined. If [shortName] is `null`
- /// then [displayName] will be used as the name of this element. Otherwise
- /// the provided name will be used.
- @Deprecated('Use getExtendedDisplayName instead')
- String getExtendedDisplayName2({String? shortName});
-
/// Whether the element, assuming that it is within scope, is accessible to
/// code in the given [library].
///
@@ -825,17 +559,6 @@
/// </blockquote>
bool isAccessibleIn(LibraryElement library);
- /// Whether the 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);
-
/// Whether this Element is annotated with a `Deprecated` annotation with a
/// `_DeprecationKind` of [kind].
bool isDeprecatedWithKind(String kind);
@@ -847,33 +570,14 @@
Element? thisOrAncestorMatching(bool Function(Element) predicate);
/// Returns either this element or the most immediate ancestor of this element
- /// for which the [predicate] returns `true`.
- ///
- /// Returns `null` if there is no such element.
- @Deprecated('Use thisOrAncestorMatching instead')
- Element? thisOrAncestorMatching2(bool Function(Element) predicate);
-
- /// Returns either this element or the most immediate ancestor of this element
/// that has the given type.
///
/// Returns `null` if there is no such element.
E? thisOrAncestorOfType<E extends Element>();
- /// Returns either this element or the most immediate ancestor of this element
- /// that has the given type.
- ///
- /// Returns `null` if there is no such element.
- @Deprecated('Use thisOrAncestorOfType instead')
- E? thisOrAncestorOfType2<E extends Element>();
-
/// Uses the given [visitor] to visit all of the children of this element.
/// There is no guarantee of the order in which the children will be visited.
void visitChildren<T>(ElementVisitor2<T> visitor);
-
- /// Uses the given [visitor] to visit all of the children of this element.
- /// There is no guarantee of the order in which the children will be visited.
- @Deprecated('Use visitChildren instead')
- void visitChildren2<T>(ElementVisitor2<T> visitor);
}
/// A single annotation associated with an element.
@@ -902,17 +606,6 @@
/// other element.
Element? get element;
- /// Returns the element referenced by this annotation.
- ///
- /// In valid code this element can be a [GetterElement] of a constant
- /// top-level variable, or a constant static field of a class; or a
- /// constant [ConstructorElement].
- ///
- /// In invalid code this element can be `null`, or a reference to any
- /// other element.
- @Deprecated('Use element instead')
- Element? get element2;
-
/// Whether the annotation marks the associated function as always throwing.
bool get isAlwaysThrows;
@@ -1047,10 +740,7 @@
/// A directive within a library fragment.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class ElementDirective
- implements
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class ElementDirective {
/// The library fragment that contains this object.
LibraryFragment get libraryFragment;
@@ -1061,7 +751,6 @@
///
/// The list will be empty if the receiver does not have any metadata or if
/// the library containing this element has not yet been fully resolved.
- @override
Metadata get metadata;
/// The interpretation of the URI specified in the directive.
@@ -1321,10 +1010,6 @@
/// The constants defined by the enum.
List<FieldElement> get constants;
- /// The constants defined by the enum.
- @Deprecated('Use constants instead')
- List<FieldElement> get constants2;
-
@override
EnumFragment get firstFragment;
@@ -1339,10 +1024,6 @@
/// The constants defined by this fragment of the enum.
List<FieldElement> get constants;
- /// The constants defined by this fragment of the enum.
- @Deprecated('Use constants instead')
- List<FieldElement> get constants2;
-
@override
EnumElement get element;
@@ -1481,17 +1162,9 @@
/// The primary constructor of this extension.
ConstructorElement get primaryConstructor;
- /// The primary constructor of this extension.
- @Deprecated('Use primaryConstructor instead')
- ConstructorElement get primaryConstructor2;
-
/// The representation of this extension.
FieldElement get representation;
- /// The representation of this extension.
- @Deprecated('Use representation instead')
- FieldElement get representation2;
-
/// The extension type erasure, obtained by recursively replacing every
/// subterm which is an extension type by the corresponding representation
/// type.
@@ -1511,22 +1184,6 @@
@override
ExtensionTypeFragment? get previousFragment;
-
- /// The primary constructor of this extension.
- @Deprecated('Use ExtensionTypeElement.primaryConstructor instead')
- ConstructorFragment get primaryConstructor;
-
- /// The primary constructor of this extension.
- @Deprecated('Use primaryConstructor instead')
- ConstructorFragment get primaryConstructor2;
-
- /// The representation of this extension.
- @Deprecated('Use ExtensionTypeElement.representation instead')
- FieldFragment get representation;
-
- /// The representation of this extension.
- @Deprecated('Use representation instead')
- FieldFragment get representation2;
}
/// A field defined within a class, enum, extension, or mixin.
@@ -1539,10 +1196,6 @@
@override
InstanceElement get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- InstanceElement get enclosingElement2;
-
@override
FieldFragment get firstFragment;
@@ -1577,12 +1230,6 @@
/// Returns `null` if the parameter references a field that doesn't exist.
FieldElement? get field;
- /// The field element associated with this field formal parameter.
- ///
- /// Returns `null` if the parameter references a field that doesn't exist.
- @Deprecated('Use field instead')
- FieldElement? get field2;
-
@override
FieldFormalParameterFragment get firstFragment;
@@ -1630,11 +1277,7 @@
/// A formal parameter defined by an executable element.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class FormalParameterElement
- implements
- VariableElement,
- Annotatable, // ignore:deprecated_member_use_from_same_package
- LocalElement {
+abstract class FormalParameterElement implements VariableElement, LocalElement {
@override
FormalParameterElement get baseElement;
@@ -1723,21 +1366,9 @@
/// parameter.
List<TypeParameterElement> get typeParameters;
- /// The type parameters defined by this parameter.
- ///
- /// A parameter will only define type parameters if it is a function typed
- /// parameter.
- @Deprecated('Use typeParameters instead')
- List<TypeParameterElement> get typeParameters2;
-
/// Appends the type, name and possibly the default value of this parameter
/// to the given [buffer].
void appendToWithoutDelimiters(StringBuffer buffer);
-
- /// Appends the type, name and possibly the default value of this parameter
- /// to the given [buffer].
- @Deprecated('Use appendToWithoutDelimiters instead')
- void appendToWithoutDelimiters2(StringBuffer buffer);
}
/// The portion of a [FormalParameterElement] contributed by a single
@@ -1745,10 +1376,7 @@
///
/// Clients may not extend, implement, or mix-in this class.
abstract class FormalParameterFragment
- implements
- VariableFragment,
- Annotatable, // ignore:deprecated_member_use_from_same_package
- LocalFragment {
+ implements VariableFragment, LocalFragment {
@override
FormalParameterElement get element;
@@ -1784,13 +1412,6 @@
/// In particular, they are not guaranteed to be in lexical order.
List<Fragment> get children;
- /// The children of this fragment.
- ///
- /// There is no guarantee of the order in which the children will be returned.
- /// In particular, they are not guaranteed to be in lexical order.
- @Deprecated('Use children instead')
- List<Fragment> get children3;
-
/// The content of the documentation comment (including delimiters) for this
/// fragment.
///
@@ -1843,34 +1464,6 @@
/// For both unary and binary `-` operator this is `-`.
String? get name;
- /// The name of the fragment.
- ///
- /// Never empty.
- ///
- /// If a fragment, e.g. an [ExtensionFragment], does not have a name,
- /// then the name is `null`.
- ///
- /// For an unnamed [ConstructorFragment] the name is `new`, but [nameOffset]
- /// is `null`. If there is an explicit `ClassName.new`, the name is also
- /// `new`, and [nameOffset] is not `null`. For a synthetic default unnamed
- /// [ConstructorElement] there is always a synthetic [ConstructorFragment]
- /// with the name `new`, and [nameOffset] is `null`.
- ///
- /// If the fragment declaration node does not have the name specified, and
- /// the parser inserted a synthetic token, then the name is `null`, and
- /// [nameOffset] is `null`.
- ///
- /// For a synthetic [GetterFragment] or [SetterFragment] the name is the
- /// name of the corresponding non-synthetic [PropertyInducingFragment],
- /// which is usually not `null`, but could be. And `nameOffset2` is `null`
- /// for such synthetic fragments.
- ///
- /// For a [SetterFragment] this is the identifier, without `=` at the end.
- ///
- /// For both unary and binary `-` operator this is `-`.
- @Deprecated('Use name instead')
- String? get name2;
-
/// The offset of the [name] of this element.
///
/// If a fragment, e.g. an [ExtensionFragment], does not have a name,
@@ -1884,20 +1477,6 @@
/// is `null`.
int? get nameOffset;
- /// The offset of the [name] of this element.
- ///
- /// If a fragment, e.g. an [ExtensionFragment], does not have a name,
- /// then the name offset is `null`.
- ///
- /// If the fragment declaration node does not have the name specified, and
- /// the parser inserted a synthetic token, then the name is `null`, and
- /// the name offset is `null`.
- ///
- /// For a synthetic fragment, e.g. [ConstructorFragment] the name offset
- /// is `null`.
- @Deprecated('Use nameOffset instead')
- int? get nameOffset2;
-
/// The next fragment in the augmentation chain.
///
/// Returns `null` if this is the last fragment in the chain.
@@ -2007,11 +1586,6 @@
/// `null` if there is no corresponding setter.
SetterElement? get correspondingSetter;
- /// The setter that corresponds to (has the same name as) this getter, or
- /// `null` if there is no corresponding setter.
- @Deprecated('Use correspondingSetter instead')
- SetterElement? get correspondingSetter2;
-
@override
GetterFragment get firstFragment;
@@ -2054,27 +1628,16 @@
/// An element whose instance members can refer to `this`.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class InstanceElement
- implements
- TypeDefiningElement, // ignore:deprecated_member_use_from_same_package
- TypeParameterizedElement {
+abstract class InstanceElement implements TypeParameterizedElement {
@override
InstanceElement get baseElement;
@override
LibraryElement get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- LibraryElement get enclosingElement2;
-
/// The fields declared in this element.
List<FieldElement> get fields;
- /// The fields declared in this element.
- @Deprecated('Use fields instead')
- List<FieldElement> get fields2;
-
@override
InstanceFragment get firstFragment;
@@ -2084,55 +1647,27 @@
/// The getters declared in this element.
List<GetterElement> get getters;
- /// The getters declared in this element.
- @Deprecated('Use getters instead')
- List<GetterElement> get getters2;
-
/// The methods declared in this element.
List<MethodElement> get methods;
- /// The methods declared in this element.
- @Deprecated('Use methods instead')
- List<MethodElement> get methods2;
-
/// The setters declared in this element.
List<SetterElement> get setters;
- /// The setters declared in this element.
- @Deprecated('Use setters instead')
- List<SetterElement> get setters2;
-
/// The type of a `this` expression.
DartType get thisType;
/// Returns the field from [fields] that has the given [name].
FieldElement? getField(String name);
- /// Returns the field from [fields] that has the given [name].
- @Deprecated('Use getField instead')
- FieldElement? getField2(String name);
-
/// Returns the getter from [getters] that has the given [name].
GetterElement? getGetter(String name);
- /// Returns the getter from [getters] that has the given [name].
- @Deprecated('Use getGetter instead')
- GetterElement? getGetter2(String name);
-
/// Returns the method from [methods] that has the given [name].
MethodElement? getMethod(String name);
- /// Returns the method from [methods] that has the given [name].
- @Deprecated('Use getMethod instead')
- MethodElement? getMethod2(String name);
-
/// Returns the setter from [setters] that has the given [name].
SetterElement? getSetter(String name);
- /// Returns the setter from [setters] that has the given [name].
- @Deprecated('Use getSetter instead')
- SetterElement? getSetter2(String name);
-
/// Returns the element representing the getter that results from looking up
/// the given [name] in this class with respect to the given [library],
/// or `null` if the look up fails.
@@ -2144,18 +1679,6 @@
required LibraryElement library,
});
- /// Returns the element representing the getter that results from looking up
- /// the given [name] in this class with respect to the given [library],
- /// or `null` if the look up fails.
- ///
- /// The behavior of this method is defined by the Dart Language Specification
- /// in section 17.18 Lookup.
- @Deprecated('Use lookUpGetter instead')
- GetterElement? lookUpGetter2({
- required String name,
- required LibraryElement library,
- });
-
/// Returns the element representing the method that results from looking up
/// the given [name] in this class with respect to the given [library],
/// or `null` if the look up fails.
@@ -2167,18 +1690,6 @@
required LibraryElement library,
});
- /// Returns the element representing the method that results from looking up
- /// the given [name] in this class with respect to the given [library],
- /// or `null` if the look up fails.
- ///
- /// The behavior of this method is defined by the Dart Language Specification
- /// in section 17.18 Lookup.
- @Deprecated('Use lookUpMethod instead')
- MethodElement? lookUpMethod2({
- required String name,
- required LibraryElement library,
- });
-
/// Returns the element representing the setter that results from looking up
/// the given [name] in this class with respect to the given [library],
/// or `null` if the look up fails.
@@ -2189,27 +1700,12 @@
required String name,
required LibraryElement library,
});
-
- /// Returns the element representing the setter that results from looking up
- /// the given [name] in this class with respect to the given [library],
- /// or `null` if the look up fails.
- ///
- /// The behavior of this method is defined by the Dart Language Specification
- /// in section 17.18 Lookup.
- @Deprecated('Use lookUpSetter instead')
- SetterElement? lookUpSetter2({
- required String name,
- required LibraryElement library,
- });
}
/// The portion of an [InstanceElement] contributed by a single declaration.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class InstanceFragment
- implements
- TypeDefiningFragment, // ignore:deprecated_member_use_from_same_package
- TypeParameterizedFragment {
+abstract class InstanceFragment implements TypeParameterizedFragment {
@override
InstanceElement get element;
@@ -2219,10 +1715,6 @@
/// The fields declared in this fragment.
List<FieldFragment> get fields;
- /// The fields declared in this fragment.
- @Deprecated('Use fields instead')
- List<FieldFragment> get fields2;
-
/// The getters declared in this fragment.
List<GetterFragment> get getters;
@@ -2237,10 +1729,6 @@
/// The methods declared in this fragment.
List<MethodFragment> get methods;
- /// The methods declared in this fragment.
- @Deprecated('Use methods instead')
- List<MethodFragment> get methods2;
-
@override
InstanceFragment? get nextFragment;
@@ -2266,12 +1754,6 @@
/// The list is empty for [MixinElement].
List<ConstructorElement> get constructors;
- /// The constructors defined for this element.
- ///
- /// The list is empty for [MixinElement].
- @Deprecated('Use constructors instead')
- List<ConstructorElement> get constructors2;
-
@override
InterfaceFragment get firstFragment;
@@ -2372,13 +1854,6 @@
/// constructor will be returned.
ConstructorElement? get unnamedConstructor;
- /// The unnamed constructor declared directly in this class.
- ///
- /// If the class does not declare any constructors, a synthetic default
- /// constructor will be returned.
- @Deprecated('Use unnamedConstructor instead')
- ConstructorElement? get unnamedConstructor2;
-
/// Returns the most specific member with the given [name] that this type
/// inherits from a superclass or mixin.
///
@@ -2417,10 +1892,6 @@
/// Returns the constructor from [constructors] that has the given [name].
ConstructorElement? getNamedConstructor(String name);
- /// Returns the constructor from [constructors] that has the given [name].
- @Deprecated('Use getNamedConstructor instead')
- ConstructorElement? getNamedConstructor2(String name);
-
/// Returns all members of mixins, superclasses, and interfaces that a member
/// with the given [name], defined in this element, would override; or `null`
/// if no members would be overridden.
@@ -2487,27 +1958,6 @@
required String methodName,
required LibraryElement library,
});
-
- /// Returns the element representing the method that results from looking up
- /// the given [methodName] in the superclass of this class with respect to the
- /// given [library], or `null` if the look up fails.
- ///
- /// The behavior of this method is defined by the Dart Language Specification
- /// in section 16.15.1:
- /// <blockquote>
- /// The result of looking up method <i>m</i> in class <i>C</i> with respect to
- /// library <i>L</i> is: If <i>C</i> declares an instance method named
- /// <i>m</i> that is accessible to <i>L</i>, then that method is the result of
- /// the lookup. Otherwise, if <i>C</i> has a superclass <i>S</i>, then the
- /// result of the lookup is the result of looking up method <i>m</i> in
- /// <i>S</i> with respect to <i>L</i>. Otherwise, we say that the lookup has
- /// failed.
- /// </blockquote>
- @Deprecated('Use lookUpInheritedMethod instead')
- MethodElement? lookUpInheritedMethod2({
- required String methodName,
- required LibraryElement library,
- });
}
/// The portion of an [InterfaceElement] contributed by a single declaration.
@@ -2519,36 +1969,14 @@
/// The list is empty for [MixinFragment].
List<ConstructorFragment> get constructors;
- /// The constructors declared in this fragment.
- ///
- /// The list is empty for [MixinFragment].
- @Deprecated('Use constructors instead')
- List<ConstructorFragment> get constructors2;
-
@override
InterfaceElement get element;
- /// The interfaces that are implemented by this fragment.
- @Deprecated('Use InterfaceElement.interfaces instead')
- List<InterfaceType> get interfaces;
-
- /// The mixins that are applied by this fragment.
- ///
- /// [ClassFragment] and [EnumFragment] can have mixins.
- ///
- /// [MixinFragment] cannot have mixins, so the empty list is returned.
- @Deprecated('Use InterfaceElement.mixins instead')
- List<InterfaceType> get mixins;
-
@override
InterfaceFragment? get nextFragment;
@override
InterfaceFragment? get previousFragment;
-
- /// The superclass declared by this fragment.
- @Deprecated('Use InterfaceElement.supertype instead')
- InterfaceType? get supertype;
}
/// A pattern variable that is a join of other pattern variables, created
@@ -2570,10 +1998,6 @@
/// The variables that join into this variable.
List<PatternVariableElement> get variables;
-
- /// The variables that join into this variable.
- @Deprecated('Use variables instead')
- List<PatternVariableElement> get variables2;
}
/// The portion of a [JoinPatternVariableElement] contributed by a single
@@ -2603,10 +2027,6 @@
// TODO(brianwilkerson): We shouldn't be inheriting this member.
ExecutableElement? get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- ExecutableElement? get enclosingElement2;
-
@override
LabelFragment get firstFragment;
@@ -2615,10 +2035,6 @@
@override
LibraryElement get library;
-
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2;
}
/// The portion of a [LabelElement] contributed by a single declaration.
@@ -2638,11 +2054,7 @@
/// A library.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class LibraryElement
- implements
- Element,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class LibraryElement implements Element {
/// The classes defined in this library.
///
/// There is no guarantee of the order in which the classes will be returned.
@@ -2657,15 +2069,6 @@
/// function whose name is `main`.
TopLevelFunctionElement? get entryPoint;
- /// The entry point for this library.
- ///
- /// Returns `null` if this library doesn't have an entry point.
- ///
- /// The entry point is defined to be a zero, one, or two argument top-level
- /// function whose name is `main`.
- @Deprecated('Use entryPoint instead')
- TopLevelFunctionElement? get entryPoint2;
-
/// The enums defined in this library.
///
/// There is no guarantee of the order in which the enums will be returned.
@@ -2680,15 +2083,6 @@
// clear that it's useful, given that it ignores hide and show clauses.
List<LibraryElement> get exportedLibraries;
- /// The libraries that are exported from this library.
- ///
- /// There is no guarantee of the order in which the libraries will be
- /// returned. In particular, they are not guaranteed to be in lexical order.
- // TODO(brianwilkerson): Consider removing this from the public API. It isn't
- // clear that it's useful, given that it ignores hide and show clauses.
- @Deprecated('Use exportedLibraries instead')
- List<LibraryElement> get exportedLibraries2;
-
/// The export [Namespace] of this library.
Namespace get exportNamespace;
@@ -2746,10 +2140,6 @@
@override
LibraryElement get library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2;
-
/// The element representing the synthetic function `loadLibrary`.
///
/// Technically the function is implicitly defined for this library only if
@@ -2757,14 +2147,6 @@
/// defined for performance reasons.
TopLevelFunctionElement get loadLibraryFunction;
- /// The element representing the synthetic function `loadLibrary`.
- ///
- /// Technically the function is implicitly defined for this library only if
- /// the library is imported using a deferred import, but the element is always
- /// defined for performance reasons.
- @Deprecated('Use loadLibraryFunction instead')
- TopLevelFunctionElement get loadLibraryFunction2;
-
/// The mixins defined in this library.
///
/// There is no guarantee of the order in which the mixins will be returned.
@@ -2817,17 +2199,9 @@
/// Returns the class defined in this library that has the given [name].
ClassElement? getClass(String name);
- /// Returns the class defined in this library that has the given [name].
- @Deprecated('Use getClass instead')
- ClassElement? getClass2(String name);
-
/// Returns the enum defined in this library that has the given [name].
EnumElement? getEnum(String name);
- /// Returns the enum defined in this library that has the given [name].
- @Deprecated('Use getEnum instead')
- EnumElement? getEnum2(String name);
-
/// Returns the extension defined in this library that has the given [name].
ExtensionElement? getExtension(String name);
@@ -2841,10 +2215,6 @@
/// Returns the mixin defined in this library that has the given [name].
MixinElement? getMixin(String name);
- /// Returns the mixin defined in this library that has the given [name].
- @Deprecated('Use getMixin instead')
- MixinElement? getMixin2(String name);
-
/// Returns the setter defined in this library that has the given [name].
SetterElement? getSetter(String name);
@@ -2871,10 +2241,6 @@
/// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
LibraryElement? get exportedLibrary;
- /// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
- @Deprecated('Use exportedLibrary instead')
- LibraryElement? get exportedLibrary2;
-
/// The offset of the `export` keyword.
int get exportKeywordOffset;
}
@@ -2884,17 +2250,9 @@
/// The extension elements accessible within this fragment.
List<ExtensionElement> get accessibleExtensions;
- /// The extension elements accessible within this fragment.
- @Deprecated('Use accessibleExtensions instead')
- List<ExtensionElement> get accessibleExtensions2;
-
/// The fragments of the classes declared in this fragment.
List<ClassFragment> get classes;
- /// The fragments of the classes declared in this fragment.
- @Deprecated('Use classes instead')
- List<ClassFragment> get classes2;
-
@override
LibraryElement get element;
@@ -2904,31 +2262,15 @@
/// The fragments of the enums declared in this fragment.
List<EnumFragment> get enums;
- /// The fragments of the enums declared in this fragment.
- @Deprecated('Use enums instead')
- List<EnumFragment> get enums2;
-
/// The fragments of the extensions declared in this fragment.
List<ExtensionFragment> get extensions;
- /// The fragments of the extensions declared in this fragment.
- @Deprecated('Use extensions instead')
- List<ExtensionFragment> get extensions2;
-
/// The fragments of the extension types declared in this fragment.
List<ExtensionTypeFragment> get extensionTypes;
- /// The fragments of the extension types declared in this fragment.
- @Deprecated('Use extensionTypes instead')
- List<ExtensionTypeFragment> get extensionTypes2;
-
/// The fragments of the top-level functions declared in this fragment.
List<TopLevelFunctionFragment> get functions;
- /// The fragments of the top-level functions declared in this fragment.
- @Deprecated('Use functions instead')
- List<TopLevelFunctionFragment> get functions2;
-
/// The fragments of the top-level getters declared in this fragment.
List<GetterFragment> get getters;
@@ -2938,37 +2280,18 @@
/// those that are imported without a prefix.
List<LibraryElement> get importedLibraries;
- /// The libraries that are imported by this unit.
- ///
- /// This includes all of the libraries that are imported using a prefix, and
- /// those that are imported without a prefix.
- @Deprecated('Use importedLibraries instead')
- List<LibraryElement> get importedLibraries2;
-
/// The libraries exported by this unit.
List<LibraryExport> get libraryExports;
- /// The libraries exported by this unit.
- @Deprecated('Use libraryExports instead')
- List<LibraryExport> get libraryExports2;
-
/// The libraries imported by this unit.
List<LibraryImport> get libraryImports;
- /// The libraries imported by this unit.
- @Deprecated('Use libraryImports instead')
- List<LibraryImport> get libraryImports2;
-
/// The [LineInfo] for the fragment.
LineInfo get lineInfo;
/// The fragments of the mixins declared in this fragment.
List<MixinFragment> get mixins;
- /// The fragments of the mixins declared in this fragment.
- @Deprecated('Use mixins instead')
- List<MixinFragment> get mixins2;
-
@override
LibraryFragment? get nextFragment;
@@ -3003,16 +2326,8 @@
/// The fragments of the top-level variables declared in this fragment.
List<TopLevelVariableFragment> get topLevelVariables;
- /// The fragments of the top-level variables declared in this fragment.
- @Deprecated('Use topLevelVariables instead')
- List<TopLevelVariableFragment> get topLevelVariables2;
-
/// The fragments of the type aliases declared in this fragment.
List<TypeAliasFragment> get typeAliases;
-
- /// The fragments of the type aliases declared in this fragment.
- @Deprecated('Use typeAliases instead')
- List<TypeAliasFragment> get typeAliases2;
}
/// An `import` directive within a library fragment.
@@ -3027,10 +2342,6 @@
/// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
LibraryElement? get importedLibrary;
- /// The [LibraryElement], if [uri] is a [DirectiveUriWithLibrary].
- @Deprecated('Use importedLibrary instead')
- LibraryElement? get importedLibrary2;
-
/// The offset of the `import` keyword.
int get importKeywordOffset;
@@ -3048,12 +2359,6 @@
///
/// Returns `null` if there was no prefix specified.
PrefixFragment? get prefix;
-
- /// The prefix fragment that was specified as part of the import directive.
- ///
- /// Returns `null` if there was no prefix specified.
- @Deprecated('Use prefix instead')
- PrefixFragment? get prefix2;
}
class LibraryLanguageVersion {
@@ -3122,12 +2427,7 @@
/// A local variable.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class LocalVariableElement
- implements
- VariableElement,
- LocalElement,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class LocalVariableElement implements VariableElement, LocalElement {
@override
LocalVariableElement get baseElement;
@@ -3339,16 +2639,6 @@
/// a cycle. Clients that traverse the inheritance structure must explicitly
/// guard against infinite loops.
List<InterfaceType> get superclassConstraints;
-
- /// Whether the mixin, assuming that it is within scope, is implementable by
- /// declarations in the given [library].
- @Deprecated('Use isImplementableOutside instead')
- bool isImplementableIn(LibraryElement library);
-
- /// Whether the mixin, assuming that it is within scope, is implementable by
- /// declarations in the given [library].
- @Deprecated('Use isImplementableOutside instead')
- bool isImplementableIn2(LibraryElement library);
}
/// The portion of a [PrefixElement] contributed by a single declaration.
@@ -3388,10 +2678,6 @@
/// The elements that were defined within the scope to have the same name.
List<Element> get conflictingElements;
- /// The elements that were defined within the scope to have the same name.
- @Deprecated('Use conflictingElements instead')
- List<Element> get conflictingElements2;
-
@override
MultiplyDefinedFragment get firstFragment;
@@ -3456,11 +2742,6 @@
/// The variable in which this variable joins with other pattern variables
/// with the same name, in a logical-or pattern, or shared case scope.
JoinPatternVariableElement? get join;
-
- /// The variable in which this variable joins with other pattern variables
- /// with the same name, in a logical-or pattern, or shared case scope.
- @Deprecated('Use join instead')
- JoinPatternVariableElement? get join2;
}
/// The portion of a [PatternVariableElement] contributed by a single
@@ -3475,11 +2756,6 @@
/// with the same name, in a logical-or pattern, or shared case scope.
JoinPatternVariableFragment? get join;
- /// The variable in which this variable joins with other pattern variables
- /// with the same name, in a logical-or pattern, or shared case scope.
- @Deprecated('Use join instead')
- JoinPatternVariableFragment? get join2;
-
@override
PatternVariableFragment? get nextFragment;
@@ -3496,10 +2772,6 @@
@override
Null get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- Null get enclosingElement2;
-
@override
PrefixFragment get firstFragment;
@@ -3512,10 +2784,6 @@
@override
LibraryElement get library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2;
-
/// The name lookup scope for this import prefix.
///
/// It consists of elements imported into the enclosing library with this
@@ -3558,10 +2826,6 @@
@override
Element get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- Element get enclosingElement2;
-
@override
PropertyAccessorFragment get firstFragment;
@@ -3573,13 +2837,6 @@
/// If this getter was explicitly defined (is not synthetic) then the variable
/// associated with it will be synthetic.
PropertyInducingElement get variable;
-
- /// The field or top-level variable associated with this getter.
- ///
- /// If this getter was explicitly defined (is not synthetic) then the variable
- /// associated with it will be synthetic.
- @Deprecated('Use variable instead')
- PropertyInducingElement? get variable3;
}
/// The portion of a [GetterElement] contributed by a single declaration.
@@ -3613,11 +2870,7 @@
/// [PropertyInducingElement].
///
/// Clients may not extend, implement or mix-in this class.
-abstract class PropertyInducingElement
- implements
- VariableElement,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class PropertyInducingElement implements VariableElement {
@override
PropertyInducingFragment get firstFragment;
@@ -3630,23 +2883,12 @@
/// getter associated with it will be synthetic.
GetterElement? get getter;
- /// The getter associated with this variable.
- ///
- /// If this variable was explicitly defined (is not synthetic) then the
- /// getter associated with it will be synthetic.
- @Deprecated('Use getter instead')
- GetterElement? get getter2;
-
/// Whether any fragment of this variable has an initializer at declaration.
bool get hasInitializer;
@override
LibraryElement get library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2;
-
/// The setter associated with this variable.
///
/// Returns `null` if the variable is effectively `final` and therefore does
@@ -3658,30 +2900,13 @@
/// explicitly defined (is not synthetic) then the setter associated with
/// it will be synthetic.
SetterElement? get setter;
-
- /// The setter associated with this variable.
- ///
- /// Returns `null` if the variable is effectively `final` and therefore does
- /// not have a setter associated with it.
- ///
- /// This can happen either because the variable is explicitly defined as
- /// being `final` or because the variable is induced by an explicit getter
- /// that does not have a corresponding setter. If this variable was
- /// explicitly defined (is not synthetic) then the setter associated with
- /// it will be synthetic.
- @Deprecated('Use setter instead')
- SetterElement? get setter2;
}
/// The portion of a [PropertyInducingElement] contributed by a single
/// declaration.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class PropertyInducingFragment
- implements
- VariableFragment,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class PropertyInducingFragment implements VariableFragment {
@override
PropertyInducingElement get element;
@@ -3725,11 +2950,6 @@
/// `null` if there is no corresponding getter.
GetterElement? get correspondingGetter;
- /// The getter that corresponds to (has the same name as) this setter, or
- /// `null` if there is no corresponding getter.
- @Deprecated('Use correspondingGetter instead')
- GetterElement? get correspondingGetter2;
-
@override
SetterFragment get firstFragment;
@@ -3788,15 +3008,6 @@
/// Can be `null` for erroneous code - not existing super-constructor,
/// no corresponding parameter in the super-constructor.
FormalParameterElement? get superConstructorParameter;
-
- /// The associated super-constructor parameter, from the super-constructor
- /// that is referenced by the implicit or explicit super-constructor
- /// invocation.
- ///
- /// Can be `null` for erroneous code - not existing super-constructor,
- /// no corresponding parameter in the super-constructor.
- @Deprecated('Use superConstructorParameter instead')
- FormalParameterElement? get superConstructorParameter2;
}
/// The portion of a [SuperFormalParameterElement] contributed by a single
@@ -3893,25 +3104,7 @@
/// A type alias (`typedef`).
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeAliasElement
- implements
- TypeParameterizedElement,
- TypeDefiningElement // ignore:deprecated_member_use_from_same_package
- {
- /// If the aliased type has structure, return the corresponding element.
- /// For example, it could be [GenericFunctionTypeElement].
- ///
- /// If there is no structure, return `null`.
- @Deprecated('Use aliasedType instead')
- Element? get aliasedElement;
-
- /// If the aliased type has structure, return the corresponding element.
- /// For example, it could be [GenericFunctionTypeElement].
- ///
- /// If there is no structure, return `null`.
- @Deprecated('Use aliasedElement instead')
- Element? get aliasedElement2;
-
+abstract class TypeAliasElement implements TypeParameterizedElement {
/// The aliased type.
///
/// If non-function type aliases feature is enabled for the enclosing library,
@@ -3922,10 +3115,6 @@
@override
LibraryElement get enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- LibraryElement get enclosingElement2;
-
@override
TypeAliasFragment get firstFragment;
@@ -3951,11 +3140,7 @@
/// The portion of a [TypeAliasElement] contributed by a single declaration.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeAliasFragment
- implements
- TypeParameterizedFragment,
- TypeDefiningFragment // ignore:deprecated_member_use_from_same_package
- {
+abstract class TypeAliasFragment implements TypeParameterizedFragment {
@override
TypeAliasElement get element;
@@ -3969,50 +3154,10 @@
Null get previousFragment;
}
-/// An element that defines a type.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Check for specific elements instead')
-abstract class TypeDefiningElement implements Element, Annotatable {
- // TODO(brianwilkerson): Evaluate to see whether this type is actually needed
- // after converting clients to the new API.
-
- @override
- TypeDefiningFragment get firstFragment;
-
- @override
- List<TypeDefiningFragment> get fragments;
-}
-
-/// The portion of a [TypeDefiningElement] contributed by a single declaration.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Check for specific fragments instead')
-abstract class TypeDefiningFragment implements Fragment, Annotatable {
- @override
- TypeDefiningElement get element;
-
- @override
- TypeDefiningFragment? get nextFragment;
-
- /// The offset of the type name.
- ///
- /// If the type in the language specification and not in any source file
- /// (e.g., `dynamic`), this value is zero.
- @override
- int get offset;
-
- @override
- TypeDefiningFragment? get previousFragment;
-}
-
/// A type parameter.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterElement
- implements
- TypeDefiningElement // ignore:deprecated_member_use_from_same_package
- {
+abstract class TypeParameterElement implements Element {
@override
TypeParameterElement get baseElement;
@@ -4038,10 +3183,7 @@
/// declaration.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterFragment
- implements
- TypeDefiningFragment // ignore:deprecated_member_use_from_same_package
- {
+abstract class TypeParameterFragment implements Fragment {
@override
TypeParameterElement get element;
@@ -4055,11 +3197,7 @@
/// An element that has type parameters, such as a class, typedef, or method.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterizedElement
- implements
- Element,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class TypeParameterizedElement implements Element {
@override
TypeParameterizedFragment get firstFragment;
@@ -4076,33 +3214,18 @@
@override
LibraryElement get library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2;
-
/// The type parameters declared by this element directly.
///
/// This does not include type parameters that are declared by any enclosing
/// elements.
List<TypeParameterElement> get typeParameters;
-
- /// The type parameters declared by this element directly.
- ///
- /// This does not include type parameters that are declared by any enclosing
- /// elements.
- @Deprecated('Use typeParameters instead')
- List<TypeParameterElement> get typeParameters2;
}
/// The portion of a [TypeParameterizedElement] contributed by a single
/// declaration.
///
/// Clients may not extend, implement or mix-in this class.
-abstract class TypeParameterizedFragment
- implements
- Fragment,
- Annotatable // ignore:deprecated_member_use_from_same_package
- {
+abstract class TypeParameterizedFragment implements Fragment {
@override
TypeParameterizedElement get element;
@@ -4117,13 +3240,6 @@
/// This does not include type parameters that are declared by any enclosing
/// fragments.
List<TypeParameterFragment> get typeParameters;
-
- /// The type parameters declared by this fragment directly.
- ///
- /// This does not include type parameters that are declared by any enclosing
- /// fragments.
- @Deprecated('Use typeParameters instead')
- List<TypeParameterFragment> get typeParameters2;
}
/// A variable.
diff --git a/pkg/analyzer/lib/dart/element/element2.dart b/pkg/analyzer/lib/dart/element/element2.dart
deleted file mode 100644
index dacb77a..0000000
--- a/pkg/analyzer/lib/dart/element/element2.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-@Deprecated('Import element.dart instead')
-library;
-
-export 'package:analyzer/dart/element/element.dart';
diff --git a/pkg/analyzer/lib/dart/element/scope.dart b/pkg/analyzer/lib/dart/element/scope.dart
index 25f4e44..6be7c2e 100644
--- a/pkg/analyzer/lib/dart/element/scope.dart
+++ b/pkg/analyzer/lib/dart/element/scope.dart
@@ -22,11 +22,5 @@
abstract class ScopeLookupResult {
Element? get getter;
- @Deprecated('Use getter instead')
- Element? get getter2;
-
Element? get setter;
-
- @Deprecated('Use setter instead')
- Element? get setter2;
}
diff --git a/pkg/analyzer/lib/dart/element/type.dart b/pkg/analyzer/lib/dart/element/type.dart
index 76d4c77..e1c7afc 100644
--- a/pkg/analyzer/lib/dart/element/type.dart
+++ b/pkg/analyzer/lib/dart/element/type.dart
@@ -39,11 +39,6 @@
/// if the type is not associated with an element.
Element? get element;
- /// Return the element representing the declaration of this type, or `null`
- /// if the type is not associated with an element.
- @Deprecated('Use element instead')
- Element? get element3;
-
/// The extension type erasure of this type.
///
/// The extension type erasure of a type `V` is obtained by recursively
@@ -166,24 +161,6 @@
/// the interface implemented by the bound.
InterfaceType? asInstanceOf(InterfaceElement element);
- /// Return the canonical interface that this type implements for [element],
- /// or `null` if such an interface does not exist.
- ///
- /// For example, given the following definitions
- /// ```
- /// class A<E> {}
- /// class B<E> implements A<E> {}
- /// class C implements A<String> {}
- /// ```
- /// Asking the type `B<int>` for the type associated with `A` will return the
- /// type `A<int>`. Asking the type `C` for the type associated with `A` will
- /// return the type `A<String>`.
- ///
- /// For a [TypeParameterType] with a bound (declared or promoted), returns
- /// the interface implemented by the bound.
- @Deprecated('Use asInstanceOf instead')
- InterfaceType? asInstanceOf2(InterfaceElement element);
-
/// Return the presentation of this type as it should appear when presented
/// to users in contexts such as error messages.
///
@@ -225,10 +202,6 @@
@override
Null get element;
- @Deprecated('Use element instead')
- @override
- Null get element3;
-
/// The formal parameters.
List<FormalParameterElement> get formalParameters;
@@ -274,9 +247,6 @@
/// The alias element that is instantiated to produce a [DartType].
TypeAliasElement get element;
- @Deprecated('Use element instead.')
- TypeAliasElement get element2;
-
/// The type arguments with which the [element] was instantiated.
/// This list will be empty if the [element] is not generic.
List<DartType> get typeArguments;
@@ -294,16 +264,9 @@
/// Return a list containing all of the constructors declared in this type.
List<ConstructorElement> get constructors;
- @Deprecated('Use constructors instead')
- List<ConstructorElement> get constructors2;
-
@override
InterfaceElement get element;
- @Deprecated('Use element instead')
- @override
- InterfaceElement get element3;
-
/// Return a list containing all of the getters declared in this type.
List<GetterElement> get getters;
@@ -316,10 +279,6 @@
/// Return a list containing all of the methods declared in this type.
List<MethodElement> get methods;
- /// Return a list containing all of the methods declared in this type.
- @Deprecated('Use methods instead')
- List<MethodElement> get methods2;
-
/// Return a list containing all of the mixins that are applied to the class
/// being extended in order to derive the superclass of this class. Note that
/// this is <b>not</b>, in general, equivalent to getting the mixins from this
@@ -347,34 +306,16 @@
/// with the given name.
GetterElement? getGetter(String name);
- /// Return the element representing the getter with the given [name] that is
- /// declared in this class, or `null` if this class does not declare a getter
- /// with the given name.
- @Deprecated('Use getGetter instead')
- GetterElement? getGetter2(String name);
-
/// Return the element representing the method with the given [name] that is
/// declared in this class, or `null` if this class does not declare a method
/// with the given name.
MethodElement? getMethod(String name);
- /// Return the element representing the method with the given [name] that is
- /// declared in this class, or `null` if this class does not declare a method
- /// with the given name.
- @Deprecated('Use getMethod instead')
- MethodElement? getMethod2(String name);
-
/// Return the element representing the setter with the given [name] that is
/// declared in this class, or `null` if this class does not declare a setter
/// with the given name.
SetterElement? getSetter(String name);
- /// Return the element representing the setter with the given [name] that is
- /// declared in this class, or `null` if this class does not declare a setter
- /// with the given name.
- @Deprecated('Use getSetter instead')
- SetterElement? getSetter2(String name);
-
/// Return the element representing the constructor that results from looking
/// up the constructor with the given [name] in this class with respect to the
/// given [library], or `null` if the look up fails. The behavior of this
@@ -387,19 +328,6 @@
/// </blockquote>
ConstructorElement? lookUpConstructor(String? name, LibraryElement library);
- /// Return the element representing the constructor that results from looking
- /// up the constructor with the given [name] in this class with respect to the
- /// given [library], or `null` if the look up fails. The behavior of this
- /// method is defined by the Dart Language Specification in section 12.11.1:
- /// <blockquote>
- /// If <i>e</i> is of the form <b>new</b> <i>T.id()</i> then let <i>q<i> be
- /// the constructor <i>T.id</i>, otherwise let <i>q<i> be the constructor
- /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
- /// NoSuchMethodException is thrown.
- /// </blockquote>
- @Deprecated('Use lookUpConstructor instead')
- ConstructorElement? lookUpConstructor2(String? name, LibraryElement library);
-
/// Return the getter with the given [name].
///
/// If [concrete] is `true`, then the concrete implementation is returned,
@@ -418,25 +346,6 @@
bool recoveryStatic = false,
});
- /// Return the getter with the given [name].
- ///
- /// If [concrete] is `true`, then the concrete implementation is returned,
- /// from this type, or its superclass.
- ///
- /// If [inherited] is `true`, then only getters from the superclass are
- /// considered.
- ///
- /// If [recoveryStatic] is `true`, then static getters of the class,
- /// and its superclasses are considered. Clients should not use it.
- @Deprecated('Use lookUpGetter instead')
- GetterElement? lookUpGetter3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- });
-
/// Return the method with the given [name].
///
/// If [concrete] is `true`, then the concrete implementation is returned,
@@ -455,25 +364,6 @@
bool recoveryStatic = false,
});
- /// Return the method with the given [name].
- ///
- /// If [concrete] is `true`, then the concrete implementation is returned,
- /// from this type, or its superclass.
- ///
- /// If [inherited] is `true`, then only methods from the superclass are
- /// considered.
- ///
- /// If [recoveryStatic] is `true`, then static methods of the class,
- /// and its superclasses are considered. Clients should not use it.
- @Deprecated('Use lookUpMethod instead')
- MethodElement? lookUpMethod3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- });
-
/// Return the setter with the given [name].
///
/// If [concrete] is `true`, then the concrete implementation is returned,
@@ -491,25 +381,6 @@
bool inherited = false,
bool recoveryStatic = false,
});
-
- /// Return the setter with the given [name].
- ///
- /// If [concrete] is `true`, then the concrete implementation is returned,
- /// from this type, or its superclass.
- ///
- /// If [inherited] is `true`, then only setters from the superclass are
- /// considered.
- ///
- /// If [recoveryStatic] is `true`, then static setters of the class,
- /// and its superclasses are considered. Clients should not use it.
- @Deprecated('Use lookUpSetter instead')
- SetterElement? lookUpSetter3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- });
}
/// The type arising from code with errors, such as invalid type annotations,
@@ -558,10 +429,6 @@
@override
Null get element;
- @Deprecated('Use element instead')
- @override
- Null get element3;
-
/// The named fields (might be empty).
List<RecordTypeNamedField> get namedFields;
@@ -600,10 +467,6 @@
@override
TypeParameterElement get element;
-
- @Deprecated('Use element instead')
- @override
- TypeParameterElement get element3;
}
/// The special type `void` is used to indicate that the value of an
@@ -611,8 +474,4 @@
abstract class VoidType implements DartType {
@override
Null get element;
-
- @Deprecated('Use element instead')
- @override
- Null get element3;
}
diff --git a/pkg/analyzer/lib/dart/element/type_provider.dart b/pkg/analyzer/lib/dart/element/type_provider.dart
index e5c5b85..475021c 100644
--- a/pkg/analyzer/lib/dart/element/type_provider.dart
+++ b/pkg/analyzer/lib/dart/element/type_provider.dart
@@ -13,10 +13,6 @@
/// Return the element representing the built-in class `bool`.
ClassElement get boolElement;
- /// Return the element representing the built-in class `bool`.
- @Deprecated('Use boolElement instead.')
- ClassElement get boolElement2;
-
/// Return the type representing the built-in type `bool`.
InterfaceType get boolType;
@@ -29,10 +25,6 @@
/// Return the element representing the built-in class `double`.
ClassElement get doubleElement;
- /// Return the element representing the built-in class `double`.
- @Deprecated('Use doubleElement instead')
- ClassElement get doubleElement2;
-
/// Return the type representing the built-in type `double`.
InterfaceType get doubleType;
@@ -43,11 +35,6 @@
/// the SDK does not have definition of `Enum`.
ClassElement? get enumElement;
- /// Return the element representing the built-in type `Enum`, or `null` if
- /// the SDK does not have definition of `Enum`.
- @Deprecated('Use enumElement instead')
- ClassElement? get enumElement2;
-
/// Return the type representing the built-in type `Enum`, or `null` if
/// the SDK does not have definition of `Enum`.
InterfaceType? get enumType;
@@ -61,30 +48,18 @@
/// Return the element representing the built-in class `Future`.
ClassElement get futureElement;
- /// Return the element representing the built-in class `Future`.
- @Deprecated('Use futureElement instead')
- ClassElement get futureElement2;
-
/// Return the type representing `Future<Null>`.
InterfaceType get futureNullType;
/// Return the element representing the built-in class `FutureOr`.
ClassElement get futureOrElement;
- /// Return the element representing the built-in class `FutureOr`.
- @Deprecated('Use futureOrElement instead')
- ClassElement get futureOrElement2;
-
/// Return the type representing `FutureOr<Null>`.
InterfaceType get futureOrNullType;
/// Return the element representing the built-in class `int`.
ClassElement get intElement;
- /// Return the element representing the built-in class `int`.
- @Deprecated('Use intElement instead')
- ClassElement get intElement2;
-
/// Return the type representing the built-in type `int`.
InterfaceType get intType;
@@ -94,27 +69,15 @@
/// Return the element representing the built-in class `Iterable`.
ClassElement get iterableElement;
- /// Return the element representing the built-in class `Iterable`.
- @Deprecated('Use iterableElement instead')
- ClassElement get iterableElement2;
-
/// Return the type representing the type `Iterable<Object>`.
InterfaceType get iterableObjectType;
/// Return the element representing the built-in class `List`.
ClassElement get listElement;
- /// Return the element representing the built-in class `List`.
- @Deprecated('Use listElement instead')
- ClassElement get listElement2;
-
/// Return the element representing the built-in class `Map`.
ClassElement get mapElement;
- /// Return the element representing the built-in class `Map`.
- @Deprecated('Use mapElement instead')
- ClassElement get mapElement2;
-
/// Return the type representing `Map<Object, Object>`.
InterfaceType get mapObjectObjectType;
@@ -124,30 +87,18 @@
/// Return the element representing the built-in class `Null`.
ClassElement get nullElement;
- /// Return the element representing the built-in class `Null`.
- @Deprecated('Use nullElement instead')
- ClassElement get nullElement2;
-
/// Return the type representing the built-in type `Null`.
InterfaceType get nullType;
/// Return the element representing the built-in class `num`.
ClassElement get numElement;
- /// Return the element representing the built-in class `num`.
- @Deprecated('Use numElement instead')
- ClassElement get numElement2;
-
/// Return the type representing the built-in type `num`.
InterfaceType get numType;
/// Return the element representing the built-in class `Object`.
ClassElement get objectElement;
- /// Return the element representing the built-in class `Object`.
- @Deprecated('Use objectElement instead')
- ClassElement get objectElement2;
-
/// Return the type representing the built-in type `Object?`.
InterfaceType get objectQuestionType;
@@ -157,20 +108,12 @@
/// Return the element representing the built-in class `Record`.
ClassElement get recordElement;
- /// Return the element representing the built-in class `Record`.
- @Deprecated('Use recordElement instead')
- ClassElement get recordElement2;
-
/// Return the type representing the built-in type `Record`.
InterfaceType get recordType;
/// Return the element representing the built-in class `Set`.
ClassElement get setElement;
- /// Return the element representing the built-in class `Set`.
- @Deprecated('Use setElement instead')
- ClassElement get setElement2;
-
/// Return the type representing the built-in type `StackTrace`.
InterfaceType get stackTraceType;
@@ -180,27 +123,15 @@
/// Return the element representing the built-in class `Stream`.
ClassElement get streamElement;
- /// Return the element representing the built-in class `Stream`.
- @Deprecated('Use streamElement instead')
- ClassElement get streamElement2;
-
/// Return the element representing the built-in class `String`.
ClassElement get stringElement;
- /// Return the element representing the built-in class `String`.
- @Deprecated('Use stringElement instead')
- ClassElement get stringElement2;
-
/// Return the type representing the built-in type `String`.
InterfaceType get stringType;
/// Return the element representing the built-in class `Symbol`.
ClassElement get symbolElement;
- /// Return the element representing the built-in class `Symbol`.
- @Deprecated('Use symbolElement instead')
- ClassElement get symbolElement2;
-
/// Return the type representing the built-in type `Symbol`.
InterfaceType get symbolType;
@@ -221,10 +152,6 @@
/// Return `true` if [element] cannot be extended, implemented, or mixed in.
bool isNonSubtypableClass(InterfaceElement element);
- /// Return `true` if [element] cannot be extended, implemented, or mixed in.
- @Deprecated('Use isNonSubtypableClass instead')
- bool isNonSubtypableClass2(InterfaceElement element);
-
/// Return 'true' if [id] is the name of a getter on the `Object` type.
bool isObjectGetter(String id);
diff --git a/pkg/analyzer/lib/dart/element/type_system.dart b/pkg/analyzer/lib/dart/element/type_system.dart
index c3851e3..2792571 100644
--- a/pkg/analyzer/lib/dart/element/type_system.dart
+++ b/pkg/analyzer/lib/dart/element/type_system.dart
@@ -47,25 +47,11 @@
});
/// Instantiate the given [element] with default type arguments.
- @Deprecated('Use instantiateInterfaceToBounds instead')
- InterfaceType instantiateInterfaceToBounds2({
- required InterfaceElement element,
- required NullabilitySuffix nullabilitySuffix,
- });
-
- /// Instantiate the given [element] with default type arguments.
DartType instantiateTypeAliasToBounds({
required TypeAliasElement element,
required NullabilitySuffix nullabilitySuffix,
});
- /// Instantiate the given [element] with default type arguments.
- @Deprecated('Use instantiateTypeAliasToBounds instead')
- DartType instantiateTypeAliasToBounds2({
- required TypeAliasElement element,
- required NullabilitySuffix nullabilitySuffix,
- });
-
/// Return `true` if the [fromType] is assignable to the [toType]. Enforce
/// strict-casts, if [strictCasts] is set to true.
///
diff --git a/pkg/analyzer/lib/error/listener.dart b/pkg/analyzer/lib/error/listener.dart
index 668db0c..6408da2 100644
--- a/pkg/analyzer/lib/error/listener.dart
+++ b/pkg/analyzer/lib/error/listener.dart
@@ -9,23 +9,13 @@
export 'package:analyzer/src/error/listener.dart' show DiagnosticReporter;
-@Deprecated("Use 'BooleanDiagnosticListener' instead")
-typedef BooleanErrorListener = BooleanDiagnosticListener;
-
@Deprecated("Use 'DiagnosticReporter' instead")
typedef ErrorReporter = DiagnosticReporter;
-@Deprecated("Use 'RecordingDiagnosticListener' instead")
-typedef RecorderingErrorListener = RecordingDiagnosticListener;
-
/// An object that listens for [Diagnostic]s being produced by the analysis
/// engine.
@Deprecated("Use 'DiagnosticListener' instead")
abstract class AnalysisErrorListener implements DiagnosticOrErrorListener {
- /// A diagnostic listener that ignores diagnostics that are reported to it.
- @Deprecated("Use 'DiagnosticListener.nullListener' instead")
- static const AnalysisErrorListener NULL_LISTENER = _NullErrorListener();
-
/// This method is invoked when a [diagnostic] has been found by the analysis
/// engine.
void onError(Diagnostic diagnostic);
@@ -111,20 +101,6 @@
}
}
-// ignore: deprecated_member_use_from_same_package
-/// An [AnalysisErrorListener] that ignores everything.
-class _NullErrorListener
- implements
- // ignore: deprecated_member_use_from_same_package
- AnalysisErrorListener {
- const _NullErrorListener();
-
- @override
- void onError(Diagnostic diagnostic) {
- // Ignore diagnostics.
- }
-}
-
extension DiagnosticOrErrorListenerExtension on DiagnosticOrErrorListener {
void onDiagnostic(Diagnostic diagnostic) => switch (this) {
DiagnosticListener self => self.onDiagnostic(diagnostic),
diff --git a/pkg/analyzer/lib/src/dart/analysis/results.dart b/pkg/analyzer/lib/src/dart/analysis/results.dart
index 24044e3..d9bc91c 100644
--- a/pkg/analyzer/lib/src/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/results.dart
@@ -170,11 +170,7 @@
}
}
-class ElementDeclarationResultImpl
- implements
- // ignore:deprecated_member_use_from_same_package
- ElementDeclarationResult,
- FragmentDeclarationResult {
+class ElementDeclarationResultImpl implements FragmentDeclarationResult {
@override
final Fragment fragment;
@@ -281,10 +277,6 @@
final LibraryElementImpl element;
LibraryElementResultImpl(this.element);
-
- @override
- @Deprecated('Use element instead')
- LibraryElement get element2 => element;
}
class MissingSdkLibraryResultImpl implements MissingSdkLibraryResult {
@@ -301,12 +293,6 @@
ParsedLibraryResultImpl({required super.session, required this.units});
- @Deprecated('Use getFragmentDeclaration() instead')
- @override
- ElementDeclarationResultImpl? getElementDeclaration2(Fragment fragment) {
- return getFragmentDeclaration(fragment);
- }
-
@override
ElementDeclarationResultImpl? getFragmentDeclaration(Fragment fragment) {
var nameOffset = _getFragmentNameOffset(fragment);
@@ -436,18 +422,8 @@
});
@override
- @Deprecated('Use element instead')
- LibraryElement get element2 => element;
-
- @override
TypeProviderImpl get typeProvider => element.typeProvider;
- @Deprecated('Use getFragmentDeclaration() instead')
- @override
- ElementDeclarationResultImpl? getElementDeclaration2(Fragment fragment) {
- return getFragmentDeclaration(fragment);
- }
-
@override
ElementDeclarationResultImpl? getFragmentDeclaration(Fragment fragment) {
var nameOffset = _getFragmentNameOffset(fragment);
@@ -523,10 +499,6 @@
}
@override
- @Deprecated('Use libraryElement instead')
- LibraryElement get libraryElement2 => libraryElement;
-
- @override
LibraryFragmentImpl get libraryFragment => unit.declaredFragment!;
@override
diff --git a/pkg/analyzer/lib/src/dart/analysis/session.dart b/pkg/analyzer/lib/src/dart/analysis/session.dart
index 60cb1d1..8e1df9e 100644
--- a/pkg/analyzer/lib/src/dart/analysis/session.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/session.dart
@@ -104,12 +104,6 @@
}
@override
- @Deprecated('Use getParsedLibraryByElement instead')
- SomeParsedLibraryResult getParsedLibraryByElement2(LibraryElement element) {
- return getParsedLibraryByElement(element);
- }
-
- @override
SomeParsedUnitResult getParsedUnit(String path) {
checkConsistency();
return _driver.parseFileSync(path);
@@ -135,14 +129,6 @@
}
@override
- @Deprecated('Use getResolvedLibraryByElement instead')
- Future<SomeResolvedLibraryResult> getResolvedLibraryByElement2(
- LibraryElement element,
- ) {
- return getResolvedLibraryByElement(element);
- }
-
- @override
Future<SomeResolvedLibraryResult> getResolvedLibraryContaining(
String path,
) async {
diff --git a/pkg/analyzer/lib/src/dart/analysis/session_helper.dart b/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
index 09f95a0..f6fe1bf 100644
--- a/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/session_helper.dart
@@ -32,11 +32,6 @@
return null;
}
- @Deprecated('Use [getClass] instead.')
- Future<ClassElement?> getClass2(String libraryUri, String className) async {
- return await getClass(libraryUri, className);
- }
-
/// Return the [EnumElement] with the given [className] that is exported
/// from the library with the given [libraryUri], or `null` if the library
/// does not export a class with such name.
diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
index 3538b79..56da41d 100644
--- a/pkg/analyzer/lib/src/dart/ast/ast.dart
+++ b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -258,13 +258,6 @@
/// annotation couldn't be resolved.
Element? get element;
- /// The element associated with this annotation.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if this
- /// annotation couldn't be resolved.
- @Deprecated('Use element instead')
- Element? get element2;
-
/// The element annotation representing this annotation in the element model,
/// or `null` if the AST hasn't been resolved.
ElementAnnotation? get elementAnnotation;
@@ -384,12 +377,6 @@
_element = value;
}
- @Deprecated('Use element instead')
- @override
- Element? get element2 {
- return element;
- }
-
@generated
@override
Token get endToken {
@@ -1028,9 +1015,6 @@
/// In valid code this is either a [LocalVariableElement] or a
/// [FormalParameterElement].
Element? get element;
-
- @Deprecated('Use element instead')
- Element? get element2;
}
@GenerateNodeImpl(
@@ -1050,10 +1034,6 @@
return name;
}
- @Deprecated('Use element instead')
- @override
- Element? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -1111,11 +1091,7 @@
/// [Expression] operator [Expression]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class AssignmentExpression
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
- MethodReferenceExpression,
- CompoundAssignmentExpression {
+ implements MethodReferenceExpression, CompoundAssignmentExpression {
/// The expression used to compute the left hand side.
Expression get leftHandSide;
@@ -2238,11 +2214,7 @@
/// '[ ' expression '] '
/// | identifier
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
-abstract final class CascadeExpression
- implements
- Expression,
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression {
+abstract final class CascadeExpression implements Expression {
/// The cascade sections sharing the common target.
NodeList<Expression> get cascadeSections;
@@ -2826,18 +2798,6 @@
/// An 'exception' or 'stackTrace' parameter in [CatchClause].
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class CatchClauseParameter extends AstNode {
- /// The declared element.
- ///
- /// Returns `null` if the AST hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement;
-
- /// The declared element.
- ///
- /// Returns `null` if the AST hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement2;
-
/// The declared fragment.
///
/// Returns `null` if the AST hasn't been resolved.
@@ -2866,18 +2826,6 @@
return name;
}
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement {
- return declaredFragment?.element;
- }
-
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement2 {
- return declaredElement;
- }
-
@generated
@override
Token get endToken {
@@ -3032,10 +2980,6 @@
/// The left curly bracket.
Token get leftBracket;
- /// The `macro` keyword, or `null` if the keyword was absent.
- @Deprecated('Support for macros was removed')
- Token? get macroKeyword;
-
/// The members defined by the class.
NodeList<ClassMember> get members;
@@ -3073,7 +3017,6 @@
childEntitiesOrder: [
GenerateNodeProperty('augmentKeyword'),
GenerateNodeProperty('abstractKeyword'),
- GenerateNodeProperty('macroKeyword'),
GenerateNodeProperty('sealedKeyword'),
GenerateNodeProperty('baseKeyword'),
GenerateNodeProperty('interfaceKeyword'),
@@ -3104,10 +3047,6 @@
@generated
@override
- final Token? macroKeyword;
-
- @generated
- @override
final Token? sealedKeyword;
@generated
@@ -3166,7 +3105,6 @@
required super.metadata,
required this.augmentKeyword,
required this.abstractKeyword,
- required this.macroKeyword,
required this.sealedKeyword,
required this.baseKeyword,
required this.interfaceKeyword,
@@ -3223,9 +3161,6 @@
if (abstractKeyword case var abstractKeyword?) {
return abstractKeyword;
}
- if (macroKeyword case var macroKeyword?) {
- return macroKeyword;
- }
if (sealedKeyword case var sealedKeyword?) {
return sealedKeyword;
}
@@ -3289,7 +3224,6 @@
ChildEntities get _childEntities => super._childEntities
..addToken('augmentKeyword', augmentKeyword)
..addToken('abstractKeyword', abstractKeyword)
- ..addToken('macroKeyword', macroKeyword)
..addToken('sealedKeyword', sealedKeyword)
..addToken('baseKeyword', baseKeyword)
..addToken('interfaceKeyword', interfaceKeyword)
@@ -4210,20 +4144,6 @@
/// used for navigation.
Element? get readElement;
- /// The element that is used to read the value.
- ///
- /// Returns `null` if this node isn't a compound assignment, if the AST
- /// structure hasn't been resolved, or if the target couldn't be resolved.
- ///
- /// In valid code this element can be a [LocalVariableElement], a
- /// [FormalParameterElement], or a [GetterElement].
- ///
- /// In invalid code this element is `null`. For example, in `int += 2`. In
- /// such cases, for recovery purposes, [writeElement] is filled, and can be
- /// used for navigation.
- @Deprecated('Use readElement instead')
- Element? get readElement2;
-
/// The type of the value read with the [readElement], or `null` if this node
/// isn't a compound assignment.
///
@@ -4248,24 +4168,6 @@
/// [readElement] and [writeElement] could be non-`null`.
Element? get writeElement;
- /// The element that is used to write the result.
- ///
- /// Returns `null` if the AST structure hasn't been resolved, or if the target
- /// couldn't be resolved.
- ///
- /// In valid code this is a [LocalVariableElement], [FormalParameterElement],
- /// or a [SetterElement].
- ///
- /// In invalid code, for recovery, we might use other elements, for example a
- /// [GetterElement] `myGetter = 0` even though the getter can't be used to set
- /// a value. We do this to help the user to navigate to the getter, and maybe
- /// add the corresponding setter.
- ///
- /// If this node is a compound assignment, such as `x += y`, both
- /// [readElement] and [writeElement] could be non-`null`.
- @Deprecated('Use writeElement instead')
- Element? get writeElement2;
-
/// The type of the target of the assignment.
///
/// The types of assigned values must be subtypes of this type.
@@ -4287,14 +4189,6 @@
@override
TypeImpl? writeType;
-
- @Deprecated('Use readElement instead')
- @override
- Element? get readElement2 => readElement;
-
- @Deprecated('Use writeElement instead')
- @override
- Element? get writeElement2 => writeElement;
}
/// A conditional expression.
@@ -5740,20 +5634,6 @@
/// [Annotation] finalConstVarOrType [SimpleIdentifier]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class DeclaredIdentifier implements Declaration {
- /// The element associated with this declaration.
- ///
- /// Returns `null` if either this node corresponds to a list of declarations
- /// or if the AST structure hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement;
-
- /// The element associated with this declaration.
- ///
- /// Returns `null` if either this node corresponds to a list of declarations
- /// or if the AST structure hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement2;
-
@override
LocalVariableFragment? get declaredFragment;
@@ -5812,18 +5692,6 @@
_becomeParentOf(type);
}
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement {
- return declaredFragment?.element;
- }
-
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement2 {
- return declaredElement;
- }
-
@generated
@override
Token get endToken {
@@ -5896,18 +5764,6 @@
/// ( 'var' | 'final' | 'final'? [TypeAnnotation])? [Identifier]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
sealed class DeclaredVariablePattern implements VariablePattern {
- /// The element declared by this declaration.
- ///
- /// Returns `null` if the AST structure hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- BindPatternVariableElement? get declaredElement;
-
- /// The element declared by this declaration.
- ///
- /// Returns `null` if the AST structure hasn't been resolved.
- @Deprecated('Use declaredFragment instead')
- BindPatternVariableElement? get declaredElement2;
-
/// The fragment declared by this declaration.
///
/// Returns `null` if the AST structure hasn't been resolved.
@@ -5961,18 +5817,6 @@
return name;
}
- @Deprecated('Use declaredFragment instead')
- @override
- BindPatternVariableElementImpl? get declaredElement {
- return declaredFragment?.element;
- }
-
- @Deprecated('Use declaredFragment instead')
- @override
- BindPatternVariableElementImpl? get declaredElement2 {
- return declaredElement;
- }
-
@generated
@override
Token get endToken {
@@ -7357,13 +7201,6 @@
/// constructor couldn't be resolved.
ConstructorElement? get constructorElement;
- /// The constructor that's invoked by this enum constant.
- ///
- /// Returns `null` if the AST structure hasn't been resolved, or if the
- /// constructor couldn't be resolved.
- @Deprecated('Use constructorElement instead')
- ConstructorElement? get constructorElement2;
-
@override
FieldFragment? get declaredFragment;
@@ -7417,10 +7254,6 @@
_arguments = _becomeParentOf(arguments);
}
- @Deprecated('Use constructorElement instead')
- @override
- InternalConstructorElement? get constructorElement2 => constructorElement;
-
@generated
@override
Token get endToken {
@@ -8758,10 +8591,6 @@
/// The extension that resolution will use to resolve member references.
ExtensionElement get element;
- /// The extension that resolution will use to resolve member references.
- @Deprecated('Use element instead')
- ExtensionElement get element2;
-
/// The actual type extended by this override, produced by applying
/// [typeArgumentTypes] to the generic type extended by the extension, or
/// `null` if the AST structure hasn't been resolved.
@@ -8855,10 +8684,6 @@
return name;
}
- @Deprecated('Use element instead')
- @override
- ExtensionElementImpl get element2 => element;
-
@generated
@override
Token get endToken {
@@ -10963,18 +10788,6 @@
///
/// Throws an exception if resolution hasn't been performed.
bool isPotentiallyMutatedInScope(VariableElement variable);
-
- /// If [variable] is a local variable or parameter declared anywhere within
- /// the top level function or method containing this [FunctionBody], return a
- /// boolean indicating whether [variable] is potentially mutated within the
- /// scope of its declaration.
- ///
- /// If [variable] isn't a local variable or parameter declared within the top
- /// level function or method containing this [FunctionBody], return `false`.
- ///
- /// Throws an exception if resolution hasn't been performed.
- @Deprecated('Use isPotentiallyMutatedInScope instead')
- bool isPotentiallyMutatedInScope2(VariableElement variable);
}
sealed class FunctionBodyImpl extends AstNodeImpl implements FunctionBody {
@@ -11010,12 +10823,6 @@
return localVariableInfo!.potentiallyMutatedInScope.contains(variable);
}
- @Deprecated('Use isPotentiallyMutatedInScope instead')
- @override
- bool isPotentiallyMutatedInScope2(VariableElement variable) {
- return isPotentiallyMutatedInScope(variable);
- }
-
/// Dispatch this function body to the resolver, imposing [imposedType] as the
/// return type context for `return` statements.
///
@@ -11447,10 +11254,7 @@
/// [Expression] [TypeArgumentList]? [ArgumentList]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class FunctionExpressionInvocation
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
- InvocationExpression {
+ implements InvocationExpression {
/// The element associated with the function being invoked based on static
/// type information.
///
@@ -13522,12 +13326,6 @@
/// Usually a [PrefixElement], but can be anything in invalid code.
Element? get element;
- /// The element to which [name] is resolved.
- ///
- /// Usually a [PrefixElement], but can be anything in invalid code.
- @Deprecated('Use element instead')
- Element? get element2;
-
/// The name of the referenced import prefix.
Token get name;
@@ -13563,10 +13361,6 @@
return name;
}
- @Deprecated('Use element instead')
- @override
- Element? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -13600,11 +13394,7 @@
/// indexExpression ::=
/// [Expression] '[' [Expression] ']'
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
-abstract final class IndexExpression
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
- MethodReferenceExpression {
+abstract final class IndexExpression implements MethodReferenceExpression {
/// The expression used to compute the index.
Expression get index;
@@ -14835,23 +14625,12 @@
/// directive couldn't be resolved.
LibraryElement? get element;
- /// The element associated with this directive.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if this
- /// directive couldn't be resolved.
- @Deprecated('Use element instead')
- LibraryElement? get element2;
-
/// The token representing the `library` keyword.
Token get libraryKeyword;
/// The name of the library being defined.
LibraryIdentifier? get name;
- /// The name of the library being defined.
- @Deprecated('Use name instead')
- LibraryIdentifier? get name2;
-
/// The semicolon terminating the directive.
Token get semicolon;
}
@@ -14890,10 +14669,6 @@
_becomeParentOf(name);
}
- @Deprecated('Use element instead')
- @override
- LibraryElementImpl? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -14915,10 +14690,6 @@
_name = _becomeParentOf(name);
}
- @Deprecated('Use name instead')
- @override
- LibraryIdentifierImpl? get name2 => name;
-
@generated
@override
ChildEntities get _childEntities => super._childEntities
@@ -16323,11 +16094,7 @@
/// ([Expression] '.')? [SimpleIdentifier] [TypeArgumentList]?
/// [ArgumentList]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
-abstract final class MethodInvocation
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
- InvocationExpression {
+abstract final class MethodInvocation implements InvocationExpression {
/// Whether this expression is cascaded.
///
/// If it is, then the target of this expression isn't stored locally but is
@@ -16912,13 +16679,6 @@
/// parameter with the same name as this expression.
FormalParameterElement? get element;
- /// The element representing the parameter being named by this expression.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if there's no
- /// parameter with the same name as this expression.
- @Deprecated('Use element instead')
- FormalParameterElement? get element2;
-
/// The expression with which the name is associated.
Expression get expression;
@@ -16961,12 +16721,6 @@
return _name.label.element?.ifTypeOrNull();
}
- @Deprecated('Use element instead')
- @override
- InternalFormalParameterElement? get element2 {
- return element;
- }
-
@generated
@override
Token get endToken {
@@ -17045,16 +16799,6 @@
/// type name, such as for `void`.
Element? get element;
- /// The element of [name] considering [importPrefix].
- ///
- /// This could be a [ClassElement], [TypeAliasElement], or other type defining
- /// element.
- ///
- /// Returns `null` if [name] can't be resolved, or there's no element for the
- /// type name, such as for `void`.
- @Deprecated('Use element instead')
- Element? get element2;
-
/// The optional import prefix before [name].
ImportPrefixReference? get importPrefix;
@@ -17069,10 +16813,6 @@
/// The name of the type.
Token get name;
- /// The name of the type.
- @Deprecated('Use name instead')
- Token get name2;
-
/// The type being named, or `null` if the AST structure hasn't been resolved,
/// or if this is part of a [ConstructorReference].
@override
@@ -17133,10 +16873,6 @@
return name;
}
- @Deprecated('Use element instead')
- @override
- Element? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -17174,10 +16910,6 @@
@override
bool get isSynthetic => name.isSynthetic && typeArguments == null;
- @Deprecated('Use name instead')
- @override
- Token get name2 => name;
-
@generated
@override
TypeArgumentListImpl? get typeArguments => _typeArguments;
@@ -18169,14 +17901,7 @@
}
}
-/// Abstract interface for expressions that may participate in null-shorting.
-///
-/// This is an analyzer-internal interface that was exposed through the public
-/// API by mistake. It is deprecated and will be removed in analyzer version
-/// 9.0.0.
-@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
-@Deprecated('No longer supported.')
-abstract final class NullShortableExpression implements Expression {
+base mixin NullShortableExpressionImpl implements Expression {
/// The expression that terminates any null shorting that might occur in this
/// expression.
///
@@ -18192,15 +17917,6 @@
/// Calling [nullShortingTermination] on any of these subexpressions yields
/// the expression `a?.b[c] = d`, indicating that the null-shorting induced by
/// the `?.` causes the rest of the subexpression `a?.b[c] = d` to be skipped.
- @Deprecated('No longer supported.')
- Expression get nullShortingTermination;
-}
-
-base mixin NullShortableExpressionImpl
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression {
- @override
Expression get nullShortingTermination {
var result = this;
while (true) {
@@ -18617,10 +18333,6 @@
/// [Annotation] 'part' [StringLiteral] ';'
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class PartDirective implements UriBasedDirective {
- /// The configurations that control which file is actually included.
- @Deprecated('Removed from the specification')
- NodeList<Configuration> get configurations;
-
/// Information about this part directive.
///
/// Returns `null` if the AST structure hasn't been resolved.
@@ -18662,12 +18374,6 @@
required this.semicolon,
});
- @Deprecated('Removed from the specification')
- @override
- NodeListImpl<ConfigurationImpl> get configurations {
- return NodeListImpl._().._initialize(this, null);
- }
-
@generated
@override
Token get endToken {
@@ -18994,15 +18700,6 @@
/// inside [RecordPattern]s.
Element? get element;
- /// The element referenced by [effectiveName].
- ///
- /// Returns `null` if the AST structure is not resolved yet.
- ///
- /// Returns non-`null` inside valid [ObjectPattern]s; always returns `null`
- /// inside [RecordPattern]s.
- @Deprecated('Use element instead')
- Element? get element2;
-
/// The name of the field, or `null` if the field is a positional field.
PatternFieldName? get name;
@@ -19055,10 +18752,6 @@
return null;
}
- @Deprecated('Use element instead')
- @override
- Element? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -19414,8 +19107,6 @@
abstract final class PostfixExpression
implements
Expression,
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
MethodReferenceExpression,
CompoundAssignmentExpression {
/// The element associated with the operator based on the static type of the
@@ -19690,8 +19381,6 @@
abstract final class PrefixExpression
implements
Expression,
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
MethodReferenceExpression,
CompoundAssignmentExpression {
/// The element associated with the operator based on the static type of the
@@ -20031,11 +19720,7 @@
/// propertyAccess ::=
/// [Expression] '.' [SimpleIdentifier]
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
-abstract final class PropertyAccess
- implements
- // ignore: deprecated_member_use_from_same_package
- NullShortableExpression,
- CommentReferableExpression {
+abstract final class PropertyAccess implements CommentReferableExpression {
/// Whether this expression is cascaded.
///
/// If it is, then the target of this expression isn't stored locally but is
@@ -21035,13 +20720,6 @@
/// operator couldn't be resolved.
MethodElement? get element;
- /// The element of the [operator] for the matched type.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if the
- /// operator couldn't be resolved.
- @Deprecated('Use element instead')
- MethodElement? get element2;
-
/// The expression used to compute the operand.
Expression get operand;
@@ -21081,10 +20759,6 @@
return operator;
}
- @Deprecated('Use element instead')
- @override
- MethodElement? get element2 => element;
-
@generated
@override
Token get endToken {
@@ -25260,20 +24934,6 @@
// that these two kinds of variables can be distinguished.
@AnalyzerPublicApi(message: 'exported by lib/dart/ast/ast.dart')
abstract final class VariableDeclaration implements Declaration {
- /// The element declared by this declaration.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if this node
- /// represents the declaration of a top-level variable or a field.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement;
-
- /// The element declared by this declaration.
- ///
- /// Returns `null` if the AST structure hasn't been resolved or if this node
- /// represents the declaration of a top-level variable or a field.
- @Deprecated('Use declaredFragment instead')
- LocalVariableElement? get declaredElement2;
-
/// The fragment declared by this declaration.
///
/// Returns `null` if the AST structure hasn't been resolved or if this node
@@ -25345,18 +25005,6 @@
_becomeParentOf(initializer);
}
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement {
- return declaredFragment?.element.ifTypeOrNull<LocalVariableElementImpl>();
- }
-
- @Deprecated('Use declaredFragment instead')
- @override
- LocalVariableElementImpl? get declaredElement2 {
- return declaredElement;
- }
-
/// This overridden implementation of [documentationComment] looks in the
/// grandparent node for Dartdoc comments if no documentation is specifically
/// available on the node.
diff --git a/pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart b/pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart
index 741e3f3..c66a46d 100644
--- a/pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart
+++ b/pkg/analyzer/lib/src/dart/ast/to_source_visitor.dart
@@ -181,7 +181,6 @@
_visitNodeList(node.metadata, separator: ' ', suffix: ' ');
_visitToken(node.augmentKeyword, suffix: ' ');
_visitToken(node.abstractKeyword, suffix: ' ');
- _visitToken(node.macroKeyword, suffix: ' ');
_visitToken(node.sealedKeyword, suffix: ' ');
_visitToken(node.baseKeyword, suffix: ' ');
_visitToken(node.interfaceKeyword, suffix: ' ');
diff --git a/pkg/analyzer/lib/src/dart/constant/value.dart b/pkg/analyzer/lib/src/dart/constant/value.dart
index 0937158..48be297 100644
--- a/pkg/analyzer/lib/src/dart/constant/value.dart
+++ b/pkg/analyzer/lib/src/dart/constant/value.dart
@@ -156,10 +156,6 @@
this.positionalArguments,
this.namedArguments,
);
-
- @Deprecated('Use constructor instead')
- @override
- ConstructorElement get constructor2 => constructor;
}
/// A representation of an instance of a Dart class.
@@ -285,10 +281,6 @@
List<DartType>? get typeArguments => (state as FunctionState).typeArguments;
@override
- @Deprecated('Use variable instead')
- VariableElement? get variable2 => variable;
-
- @override
bool operator ==(Object other) {
if (other is DartObjectImpl) {
return _typeSystem.runtimeTypesEqual(type, other.type) &&
@@ -941,12 +933,6 @@
}
@override
- @Deprecated('Use toFunctionValue instead')
- ExecutableElement? toFunctionValue2() {
- return toFunctionValue();
- }
-
- @override
int? toIntValue() {
var state = this.state;
if (state is IntState) {
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 6a04b62..7db85cd 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -64,11 +64,6 @@
part 'element.g.dart';
-// TODO(fshcheglov): Remove after third_party/pkg/dartdoc stops using it.
-// https://github.com/dart-lang/dartdoc/issues/4066
-@Deprecated('Use VariableFragmentImpl instead')
-typedef ConstVariableElement = VariableFragmentImpl;
-
class BindPatternVariableElementImpl extends PatternVariableElementImpl
implements BindPatternVariableElement {
BindPatternVariableElementImpl(super.firstFragment);
@@ -428,13 +423,6 @@
return visitor.visitClassElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedDirectlyOpaque
- T? accept2<T>(ElementVisitor2<T> visitor) {
- return accept(visitor);
- }
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -448,48 +436,6 @@
}
}
- @Deprecated('Use isExtendableOutside instead')
- @override
- @trackedIndirectly
- bool isExtendableIn(LibraryElement library) {
- return library == this.library || isExtendableOutside;
- }
-
- @Deprecated('Use isExtendableOutside instead')
- @override
- @trackedIndirectly
- bool isExtendableIn2(LibraryElement library) {
- return isExtendableIn(library);
- }
-
- @Deprecated('Use isImplementableOutside instead')
- @override
- @trackedIndirectly
- bool isImplementableIn(LibraryElement library) {
- return library == this.library || isImplementableOutside;
- }
-
- @Deprecated('Use isImplementableOutside instead')
- @override
- @trackedIndirectly
- bool isImplementableIn2(LibraryElement library) {
- return isImplementableIn(library);
- }
-
- @Deprecated('Use isMixableOutside instead')
- @override
- @trackedIndirectly
- bool isMixableIn(LibraryElement library) {
- return (library == this.library) || isMixableOutside;
- }
-
- @Deprecated('Use isMixableOutside instead')
- @override
- @trackedIndirectly
- bool isMixableIn2(LibraryElement library) {
- return isMixableIn(library);
- }
-
@trackedInternal
void linkFragments(List<ClassFragmentImpl> fragments) {
assert(identical(fragments[0], _firstFragment));
@@ -737,11 +683,6 @@
InterfaceElementImpl get enclosingElement =>
_firstFragment.enclosingFragment.element;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- InterfaceElementImpl get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
ConstructorFragmentImpl get firstFragment {
@@ -787,11 +728,6 @@
@trackedInternal
LibraryFragmentImpl get libraryFragment => _firstFragment.libraryFragment;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
@trackedIncludedInId
Element get nonSynthetic {
@@ -813,13 +749,6 @@
_redirectedConstructor = value;
}
- @Deprecated('Use redirectedConstructor instead')
- @override
- @trackedIndirectly
- InternalConstructorElement? get redirectedConstructor2 {
- return redirectedConstructor;
- }
-
@override
@trackedIncludedInId
InterfaceTypeImpl get returnType {
@@ -842,13 +771,6 @@
_superConstructor = superConstructor;
}
- @Deprecated('Use superConstructor instead')
- @override
- @trackedIndirectly
- InternalConstructorElement? get superConstructor2 {
- return superConstructor;
- }
-
@override
List<ConstructorFragmentImpl> get _fragments {
return [
@@ -868,11 +790,6 @@
return visitor.visitConstructorElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -1008,10 +925,6 @@
return !isFactory;
}
- @Deprecated('Use name instead')
- @override
- String get name2 => name;
-
@override
int get offset =>
nameOffset ??
@@ -1128,10 +1041,6 @@
required super.relativeUri,
required super.source,
});
-
- @override
- @Deprecated('Use library instead')
- LibraryElement get library2 => library;
}
class DirectiveUriWithRelativeUriImpl
@@ -1182,10 +1091,7 @@
}
/// The synthetic element representing the declaration of the type `dynamic`.
-class DynamicElementImpl extends ElementImpl
- implements
- TypeDefiningElement // ignore:deprecated_member_use_from_same_package
- {
+class DynamicElementImpl extends ElementImpl {
/// The unique instance of this class.
static final DynamicElementImpl instance = DynamicElementImpl._();
@@ -1197,10 +1103,6 @@
@override
Element? get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
DynamicFragmentImpl get firstFragment => _firstFragment;
@@ -1225,36 +1127,20 @@
@override
Null get library => null;
- @Deprecated('Use library instead')
- @override
- Null get library2 => library;
-
@override
MetadataImpl get metadata {
return MetadataImpl(const []);
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String get name => 'dynamic';
- @Deprecated('Use name instead')
- @override
- String get name3 => name;
-
@override
DynamicFragmentImpl get _firstFragment => DynamicFragmentImpl.instance;
@override
T? accept<T>(ElementVisitor2<T> visitor) => null;
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeDynamicElement(this);
@@ -1262,10 +1148,7 @@
}
/// The synthetic element representing the declaration of the type `dynamic`.
-class DynamicFragmentImpl extends FragmentImpl
- implements
- TypeDefiningFragment // ignore:deprecated_member_use_from_same_package
- {
+class DynamicFragmentImpl extends FragmentImpl {
/// The unique instance of this class.
static final DynamicFragmentImpl instance = DynamicFragmentImpl._();
@@ -1280,10 +1163,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => const [];
-
@override
DynamicElementImpl get element => DynamicElementImpl.instance;
@@ -1293,17 +1172,9 @@
@override
Null get libraryFragment => null;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String get name => 'dynamic';
- @Deprecated('Use name instead')
- @override
- String get name2 => name;
-
@override
Null get nameOffset => null;
@@ -1531,10 +1402,6 @@
Element? get element => annotationAst.element;
@override
- @Deprecated('Use element instead')
- Element? get element2 => element;
-
- @override
bool get isAlwaysThrows => _isPackageMetaGetter(_alwaysThrowsVariableName);
@override
@@ -1761,13 +1628,6 @@
ElementDirectiveImpl({required this.uri});
- @override
- Null get documentationComment => null;
-
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
/// Append a textual representation to the given [builder].
void appendTo(ElementDisplayStringBuilder builder);
@@ -1808,11 +1668,6 @@
@trackedIndirectly
List<Element> get children => const [];
- @Deprecated('Use children instead')
- @override
- @trackedIndirectly
- List<Element> get children2 => children;
-
@override
@trackedIndirectly
String get displayName => name ?? '<unnamed>';
@@ -1888,11 +1743,6 @@
@trackedIncludedInId
Element get nonSynthetic => this;
- @Deprecated('Use nonSynthetic instead')
- @override
- @trackedIndirectly
- Element get nonSynthetic2 => nonSynthetic;
-
/// The reference of this element, used during reading summaries.
///
/// Can be `null` if this element cannot be referenced from outside,
@@ -1954,19 +1804,6 @@
return builder.toString();
}
- @Deprecated('Use displayString instead')
- @override
- @trackedIndirectly
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
-
@override
@trackedIndirectly
String getExtendedDisplayName({String? shortName}) {
@@ -1975,13 +1812,6 @@
return "$shortName (${source?.fullName})";
}
- @Deprecated('Use getExtendedDisplayName instead')
- @override
- @trackedIndirectly
- String getExtendedDisplayName2({String? shortName}) {
- return getExtendedDisplayName(shortName: shortName);
- }
-
/// Whether this element has the [modifier].
@trackedIncludedInId
bool hasModifier(Modifier modifier) => _modifiers[modifier];
@@ -1996,13 +1826,6 @@
return true;
}
- @Deprecated('Use isAccessibleIn instead')
- @override
- @trackedIndirectly
- bool isAccessibleIn2(LibraryElement library) {
- return isAccessibleIn(library);
- }
-
@override
@trackedIndirectly
bool isDeprecatedWithKind(String kind) => metadata.annotations
@@ -2030,13 +1853,6 @@
return element;
}
- @Deprecated('Use thisOrAncestorMatching instead')
- @override
- @trackedIndirectly
- Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
- return thisOrAncestorMatching(predicate);
- }
-
@override
@trackedIncludedInId
E? thisOrAncestorOfType<E extends Element>() {
@@ -2049,13 +1865,6 @@
return element;
}
- @Deprecated('Use thisOrAncestorOfType instead')
- @override
- @trackedIndirectly
- E? thisOrAncestorOfType2<E extends Element>() {
- return thisOrAncestorOfType();
- }
-
@override
@trackedIndirectly
String toString() {
@@ -2073,15 +1882,6 @@
}
}
- /// Use the given [visitor] to visit all of the children of this element.
- /// There is no guarantee of the order in which the children will be visited.
- @Deprecated('Use visitChildren instead')
- @override
- @trackedIndirectly
- void visitChildren2<T>(ElementVisitor2<T> visitor) {
- visitChildren(visitor);
- }
-
@trackedInternal
void writeModifiers(BinaryWriter writer) {
_modifiers.write(writer);
@@ -2108,13 +1908,6 @@
return fields.where((field) => field.isEnumConstant).toList();
}
- @Deprecated('Use constants instead')
- @override
- @trackedIndirectly
- List<FieldElementImpl> get constants2 {
- return constants;
- }
-
@override
@trackedDirectlyOpaque
EnumFragmentImpl get firstFragment {
@@ -2159,11 +1952,6 @@
return visitor.visitEnumElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -2199,12 +1987,6 @@
return constants.map((e) => e.asElement2).toList();
}
- @Deprecated('Use constants instead')
- @override
- List<FieldElement> get constants2 {
- return constants;
- }
-
@override
EnumFragmentImpl? get nextFragment => super.nextFragment as EnumFragmentImpl?;
@@ -2237,11 +2019,6 @@
...formalParameters,
];
- @Deprecated('Use children instead')
- @override
- @trackedIndirectly
- List<Element> get children2 => children;
-
@override
ExecutableFragmentImpl get firstFragment;
@@ -2347,11 +2124,6 @@
}
}
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElement get library2 => library;
-
@override
@trackedIncludedInId
MetadataImpl get metadata {
@@ -2362,11 +2134,6 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedIncludedInId
TypeImpl get returnType {
@@ -2417,13 +2184,6 @@
);
}
- @Deprecated('Use typeParameters instead')
- @override
- @trackedIndirectly
- List<TypeParameterElementImpl> get typeParameters2 {
- return typeParameters;
- }
-
@override
ExecutableFragmentImpl get _firstFragment;
@@ -2453,10 +2213,6 @@
@override
List<Fragment> get children => [...typeParameters, ...formalParameters];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
ExecutableElementImpl get element;
@@ -2496,10 +2252,6 @@
return super.metadata;
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
int get offset => nameOffset ?? firstTokenOffset!;
@@ -2516,10 +2268,6 @@
_typeParameters = typeParameters;
}
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
-
void addTypeParameter(TypeParameterFragmentImpl fragment) {
_typeParameters.add(fragment);
fragment.enclosingFragment = this;
@@ -2590,11 +2338,6 @@
return visitor.visitExtensionElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -2634,10 +2377,6 @@
...typeParameters,
];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
String get displayName => name ?? '';
@@ -2723,13 +2462,6 @@
return constructors.first;
}
- @Deprecated('Use primaryConstructor instead')
- @override
- @trackedIndirectly
- ConstructorElement get primaryConstructor2 {
- return primaryConstructor;
- }
-
@trackedIndirectly
FieldFormalParameterElementImpl get primaryFormalParameter {
return primaryConstructor.formalParameters.first
@@ -2742,13 +2474,6 @@
return fields.first;
}
- @Deprecated('Use representation instead')
- @override
- @trackedIndirectly
- FieldElementImpl get representation2 {
- return representation;
- }
-
@override
@trackedIncludedInId
DartType get typeErasure {
@@ -2778,11 +2503,6 @@
return visitor.visitExtensionTypeElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -2818,26 +2538,6 @@
ExtensionTypeFragmentImpl? get previousFragment =>
super.previousFragment as ExtensionTypeFragmentImpl?;
- @Deprecated('Use ExtensionTypeElement.primaryConstructor instead')
- @override
- ConstructorFragmentImpl get primaryConstructor {
- return constructors.first;
- }
-
- @Deprecated('Use primaryConstructor instead')
- @override
- ConstructorFragmentImpl get primaryConstructor2 => primaryConstructor;
-
- @Deprecated('Use ExtensionTypeElement.representation instead')
- @override
- FieldFragmentImpl get representation {
- return fields.first;
- }
-
- @Deprecated('Use representation instead')
- @override
- FieldFragmentImpl get representation2 => representation;
-
void addFragment(ExtensionTypeFragmentImpl fragment) {
fragment.element = element;
fragment.previousFragment = this;
@@ -2873,11 +2573,6 @@
return _firstFragment.enclosingFragment.element;
}
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- InstanceElement get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
FieldFragmentImpl get firstFragment {
@@ -2997,11 +2692,6 @@
}
}
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElementImpl get library2 => library;
-
@override
@trackedIncludedInId
MetadataImpl get metadata {
@@ -3012,20 +2702,10 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedIncludedInId
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
@trackedDirectly
SetterElementImpl? get setter {
@@ -3056,11 +2736,6 @@
return visitor.visitFieldElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@trackedInternal
void linkFragments(List<FieldFragmentImpl> fragments) {
assert(identical(fragments[0], _firstFragment));
@@ -3078,10 +2753,6 @@
FieldFormalParameterElementImpl(super.firstFragment);
- @Deprecated('Use field instead')
- @override
- FieldElementImpl? get field2 => field;
-
@override
FieldFormalParameterFragmentImpl get firstFragment => _firstFragment;
@@ -3253,10 +2924,6 @@
return _firstFragment.enclosingFragment?.element;
}
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
FormalParameterFragmentImpl get firstFragment => _firstFragment;
@@ -3343,10 +3010,6 @@
@override
ElementKind get kind => ElementKind.PARAMETER;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl? get library2 => library;
-
@override
MetadataImpl get metadata {
var annotations = <ElementAnnotationImpl>[];
@@ -3356,21 +3019,11 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String? get name {
return _firstFragment.name;
}
- @Deprecated('Use name instead')
- @override
- String? get name3 {
- return name;
- }
-
@override
String get nameShared => _firstFragment.name ?? '';
@@ -3389,11 +3042,6 @@
);
}
- @Deprecated('Use typeParameters instead')
- @override
- // TODO(augmentations): Implement the merge of formal parameters.
- List<TypeParameterElementImpl> get typeParameters2 => typeParameters;
-
@override
TypeImpl get typeShared => type;
@@ -3414,10 +3062,6 @@
return visitor.visitFormalParameterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeFormalParameterElement(this);
@@ -3500,10 +3144,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
FormalParameterElementImpl get element {
if (_element != null) {
@@ -3599,14 +3239,6 @@
return enclosingFragment?.libraryFragment;
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
- @Deprecated('Use name instead')
- @override
- String? get name2 => name;
-
/// The type parameters defined by this parameter.
///
/// A parameter will only define type parameters if it is a function typed
@@ -3770,10 +3402,6 @@
return name;
}
- @Deprecated('Use name instead')
- @override
- String? get name2 => name;
-
/// The offset after the last character of the name, or `null` if there is
/// no declaration in code for this fragment, or the name is absent.
int? get nameEnd {
@@ -3785,10 +3413,6 @@
return null;
}
- @override
- @Deprecated('Use nameOffset instead')
- int? get nameOffset2 => nameOffset;
-
/// The version where this SDK API was added.
///
/// A `@Since()` annotation can be applied to a library declaration,
@@ -3928,10 +3552,6 @@
@override
Element? get enclosingElement => _firstFragment.enclosingFragment?.element;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
GenericFunctionTypeFragmentImpl get firstFragment => _firstFragment;
@@ -3962,24 +3582,12 @@
@override
ElementKind get kind => ElementKind.GENERIC_FUNCTION_TYPE;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl get library2 => library;
-
@override
MetadataImpl get metadata => _firstFragment.metadata;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
TypeImpl get returnType => _firstFragment.returnType;
@@ -3991,19 +3599,11 @@
.map((fragment) => fragment.element)
.toList();
- @Deprecated('Use typeParameters2 instead')
- @override
- List<TypeParameterElement> get typeParameters2 => typeParameters;
-
@override
T? accept<T>(ElementVisitor2<T> visitor) {
return visitor.visitGenericFunctionTypeElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeGenericFunctionTypeElement(this);
@@ -4040,10 +3640,6 @@
@override
List<Fragment> get children => [...typeParameters, ...formalParameters];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
GenericFunctionTypeElementImpl get element => _element2;
@@ -4064,17 +3660,9 @@
@override
LibraryFragmentImpl get libraryFragment => enclosingUnit;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String? get name => null;
- @Deprecated('Use name instead')
- @override
- String? get name2 => name;
-
@override
int? get nameOffset => null;
@@ -4131,10 +3719,6 @@
}
_typeParameters = typeParameters;
}
-
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
}
@elementClass
@@ -4166,13 +3750,6 @@
return variable.setter;
}
- @Deprecated('Use correspondingSetter instead')
- @override
- @trackedIndirectly
- SetterElement? get correspondingSetter2 {
- return correspondingSetter;
- }
-
@override
@trackedDirectlyOpaque
GetterFragmentImpl get firstFragment {
@@ -4236,11 +3813,6 @@
return visitor.visitGetterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -4328,13 +3900,6 @@
return [...fields, ...getters, ...setters, ...methods];
}
- @Deprecated('Use children instead')
- @override
- @trackedIndirectly
- List<Element> get children2 {
- return children;
- }
-
@override
@trackedIncludedInId
String get displayName {
@@ -4352,11 +3917,6 @@
@trackedIncludedInId
LibraryElementImpl get enclosingElement => library;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- LibraryElement get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyExpensive
List<FieldElementImpl> get fields {
@@ -4369,11 +3929,6 @@
_fields = value;
}
- @Deprecated('Use fields instead')
- @override
- @trackedIndirectly
- List<FieldElementImpl> get fields2 => fields;
-
@override
InstanceFragmentImpl get firstFragment;
@@ -4392,11 +3947,6 @@
_getters = value;
}
- @Deprecated('Use getters instead')
- @override
- @trackedIndirectly
- List<GetterElementImpl> get getters2 => getters;
-
@override
@trackedIncludedInId
bool get isPrivate => _firstFragment.isPrivate;
@@ -4425,22 +3975,12 @@
@trackedIncludedInId
LibraryElementImpl get library => super.library!;
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElementImpl get library2 => library;
-
@override
@trackedIncludedInId
MetadataImpl get metadata {
return _firstFragment.metadata;
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedDirectlyExpensive
List<MethodElementImpl> get methods {
@@ -4453,22 +3993,12 @@
_methods = value;
}
- @Deprecated('Use methods instead')
- @override
- @trackedIndirectly
- List<MethodElementImpl> get methods2 => methods;
-
@override
@trackedIncludedInId
String? get name {
return _firstFragment.name;
}
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
@trackedDirectlyOpaque
AnalysisSessionImpl get session {
@@ -4488,11 +4018,6 @@
_setters = value;
}
- @Deprecated('Use setters instead')
- @override
- @trackedIndirectly
- List<SetterElementImpl> get setters2 => setters;
-
@override
@trackedIncludedInId
List<TypeParameterElementImpl> get typeParameters {
@@ -4503,11 +4028,6 @@
);
}
- @Deprecated('Use typeParameters instead')
- @override
- @trackedIndirectly
- List<TypeParameterElementImpl> get typeParameters2 => typeParameters;
-
@override
InstanceFragmentImpl get _firstFragment;
@@ -4531,14 +4051,6 @@
_setters.add(element);
}
- @Deprecated('Use displayString instead')
- @override
- @trackedIndirectly
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) => displayString(multiline: multiline, preferTypeAlias: preferTypeAlias);
-
@override
@trackedDirectly
FieldElementImpl? getField(String name) {
@@ -4552,11 +4064,6 @@
});
}
- @Deprecated('Use getField instead')
- @override
- @trackedIndirectly
- FieldElementImpl? getField2(String name) => getField(name);
-
@override
@trackedDirectly
GetterElementImpl? getGetter(String name) {
@@ -4570,11 +4077,6 @@
});
}
- @Deprecated('Use getGetter instead')
- @override
- @trackedIndirectly
- GetterElementImpl? getGetter2(String name) => getGetter(name);
-
@override
@trackedDirectly
MethodElementImpl? getMethod(String name) {
@@ -4588,11 +4090,6 @@
});
}
- @Deprecated('Use getMethod instead')
- @override
- @trackedIndirectly
- MethodElementImpl? getMethod2(String name) => getMethod(name);
-
@override
@trackedDirectly
SetterElementImpl? getSetter(String name) {
@@ -4606,11 +4103,6 @@
});
}
- @Deprecated('Use getSetter instead')
- @override
- @trackedIndirectly
- SetterElementImpl? getSetter2(String name) => getSetter(name);
-
@override
@trackedIncludedInId
bool isAccessibleIn(LibraryElement library) {
@@ -4621,13 +4113,6 @@
return true;
}
- @Deprecated('Use isAccessibleIn instead')
- @override
- @trackedIndirectly
- bool isAccessibleIn2(LibraryElement library) {
- return isAccessibleIn(library);
- }
-
@override
@trackedDirectlyOpaque
GetterElement? lookUpGetter({
@@ -4641,16 +4126,6 @@
as GetterElement?;
}
- @Deprecated('Use lookUpGetter instead')
- @override
- @trackedIndirectly
- GetterElement? lookUpGetter2({
- required String name,
- required LibraryElement library,
- }) {
- return lookUpGetter(name: name, library: library);
- }
-
@override
@trackedDirectlyOpaque
MethodElement? lookUpMethod({
@@ -4663,16 +4138,6 @@
).firstWhereOrNull((method) => method.isAccessibleIn(library));
}
- @Deprecated('Use lookUpMethod instead')
- @override
- @trackedIndirectly
- MethodElement? lookUpMethod2({
- required String name,
- required LibraryElement library,
- }) {
- return lookUpMethod(name: name, library: library);
- }
-
@override
@trackedDirectlyOpaque
SetterElement? lookUpSetter({
@@ -4686,16 +4151,6 @@
as SetterElement?;
}
- @Deprecated('Use lookUpSetter instead')
- @override
- @trackedIndirectly
- SetterElement? lookUpSetter2({
- required String name,
- required LibraryElement library,
- }) {
- return lookUpSetter(name: name, library: library);
- }
-
@override
@trackedIncludedInId
Element? thisOrAncestorMatching(bool Function(Element) predicate) {
@@ -4705,13 +4160,6 @@
return library.thisOrAncestorMatching(predicate);
}
- @Deprecated('Use thisOrAncestorMatching instead')
- @override
- @trackedIndirectly
- Element? thisOrAncestorMatching2(bool Function(Element) predicate) {
- return thisOrAncestorMatching(predicate);
- }
-
@override
@trackedIncludedInId
E? thisOrAncestorOfType<E extends Element>() {
@@ -4721,13 +4169,6 @@
return library.thisOrAncestorOfType<E>();
}
- @Deprecated('Use thisOrAncestorOfType instead')
- @override
- @trackedIndirectly
- E? thisOrAncestorOfType2<E extends Element>() {
- return thisOrAncestorOfType();
- }
-
Iterable<InternalPropertyAccessorElement> _implementationsOfGetter(
String name,
) sync* {
@@ -4857,10 +4298,6 @@
_fields = fields;
}
- @Deprecated('Use fields instead')
- @override
- List<FieldFragment> get fields2 => fields.cast<FieldFragment>();
-
@override
List<GetterFragmentImpl> get getters {
if (!identical(_getters, _Sentinel.getterFragment)) {
@@ -4888,10 +4325,6 @@
return super.metadata;
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
List<MethodFragmentImpl> get methods {
if (!identical(_methods, _Sentinel.methodFragment)) {
@@ -4910,10 +4343,6 @@
_methods = methods;
}
- @Deprecated('Use methods instead')
- @override
- List<MethodFragment> get methods2 => methods.cast<MethodFragment>();
-
@override
int get offset => nameOffset ?? firstTokenOffset!;
@@ -4948,10 +4377,6 @@
_typeParameters = typeParameters;
}
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
-
void addField(FieldFragmentImpl fragment) {
if (identical(_fields, _Sentinel.fieldFragment)) {
_fields = [];
@@ -5038,13 +4463,6 @@
return [...super.children, ...constructors];
}
- @Deprecated('Use children instead')
- @override
- @trackedIndirectly
- List<Element> get children2 {
- return children;
- }
-
@override
@trackedDirectlyExpensive
List<ConstructorElementImpl> get constructors {
@@ -5064,13 +4482,6 @@
_constructors = value;
}
- @Deprecated('Use constructors instead')
- @override
- @trackedIndirectly
- List<ConstructorElementImpl> get constructors2 {
- return constructors;
- }
-
@override
InterfaceFragmentImpl get firstFragment;
@@ -5211,13 +4622,6 @@
return getNamedConstructor('new');
}
- @Deprecated('Use unnamedConstructor instead')
- @override
- @trackedIndirectly
- ConstructorElementImpl? get unnamedConstructor2 {
- return unnamedConstructor;
- }
-
@override
InterfaceFragmentImpl get _firstFragment;
@@ -5260,13 +4664,6 @@
});
}
- @Deprecated('Use getNamedConstructor instead')
- @override
- @trackedIndirectly
- ConstructorElementImpl? getNamedConstructor2(String name) {
- return getNamedConstructor(name);
- }
-
@override
@trackedDirectlyOpaque
List<ExecutableElement>? getOverridden(Name name) {
@@ -5395,16 +4792,6 @@
.ifTypeOrNull();
}
- @override
- @Deprecated('Use lookUpInheritedMethod instead')
- @trackedIndirectly
- MethodElement? lookUpInheritedMethod2({
- required String methodName,
- required LibraryElement library,
- }) {
- return lookUpInheritedMethod(methodName: methodName, library: library);
- }
-
/// Return the static getter with the [name], accessible to the [library].
///
/// This method should be used only for error recovery during analysis,
@@ -5481,10 +4868,6 @@
...typeParameters,
];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
List<ConstructorFragmentImpl> get constructors {
element.ensureReadMembers();
@@ -5504,26 +4887,12 @@
_constructors = constructors;
}
- @Deprecated('Use constructors instead')
- @override
- List<ConstructorFragmentImpl> get constructors2 {
- return constructors;
- }
-
@override
String get displayName => name ?? '';
@override
InterfaceElementImpl get element;
- @Deprecated('Use InterfaceElement.interfaces instead')
- @override
- List<InterfaceTypeImpl> get interfaces => element.interfaces;
-
- @Deprecated('Use InterfaceElement.mixins instead')
- @override
- List<InterfaceTypeImpl> get mixins => element.mixins;
-
@override
InterfaceFragmentImpl? get nextFragment {
return super.nextFragment as InterfaceFragmentImpl?;
@@ -5534,10 +4903,6 @@
return super.previousFragment as InterfaceFragmentImpl?;
}
- @Deprecated('Use InterfaceElement.supertype instead')
- @override
- InterfaceTypeImpl? get supertype => element.supertype;
-
void addConstructor(ConstructorFragmentImpl fragment) {
if (identical(_constructors, _Sentinel.constructorFragment)) {
_constructors = [];
@@ -5571,19 +4936,11 @@
@override
InternalConstructorElement? get redirectedConstructor;
- @Deprecated('Use redirectedConstructor instead')
- @override
- InternalConstructorElement? get redirectedConstructor2;
-
@override
InterfaceTypeImpl get returnType;
@override
InternalConstructorElement? get superConstructor;
-
- @Deprecated('Use superConstructor instead')
- @override
- InternalConstructorElement? get superConstructor2;
}
mixin InternalExecutableElement implements ExecutableElement {
@@ -5653,12 +5010,6 @@
buffer.write(defaultValueCode);
}
}
-
- @Deprecated('Use appendToWithoutDelimiters instead')
- @override
- void appendToWithoutDelimiters2(StringBuffer buffer) {
- appendToWithoutDelimiters(buffer);
- }
}
mixin InternalGetterElement on InternalPropertyAccessorElement
@@ -5698,10 +5049,6 @@
@override
InternalPropertyInducingElement get variable;
-
- @Deprecated('Use variable instead')
- @override
- InternalPropertyInducingElement? get variable3;
}
mixin InternalPropertyInducingElement on InternalVariableElement
@@ -5718,10 +5065,6 @@
@override
InternalGetterElement? get getter;
- @Deprecated('Use getter instead')
- @override
- InternalGetterElement? get getter2;
-
@override
LibraryElementImpl get library;
@@ -5730,10 +5073,6 @@
@override
InternalSetterElement? get setter;
-
- @Deprecated('Use setter instead')
- @override
- InternalSetterElement? get setter2;
}
mixin InternalSetterElement on InternalPropertyAccessorElement
@@ -5819,13 +5158,6 @@
List<PatternVariableElementImpl> get variables =>
_firstFragment.variables.map((fragment) => fragment.element).toList();
- /// The variables that join into this variable.
- @Deprecated('Use variables instead')
- @override
- List<PatternVariableElementImpl> get variables2 {
- return variables;
- }
-
@override
JoinPatternVariableFragmentImpl get _firstFragment =>
super._firstFragment as JoinPatternVariableFragmentImpl;
@@ -5897,10 +5229,6 @@
@override
ExecutableElement? get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- ExecutableElement? get enclosingElement2 => enclosingElement;
-
@override
LabelFragmentImpl get firstFragment => _firstFragment;
@@ -5922,38 +5250,19 @@
@override
LibraryElementImpl get library => super.library!;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2 => library;
-
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
T? accept<T>(ElementVisitor2<T> visitor) {
return visitor.visitLabelElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeLabelElement(this);
}
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) => displayString(multiline: multiline, preferTypeAlias: preferTypeAlias);
-
@override
void visitChildren<T>(ElementVisitor2<T> visitor) {}
}
@@ -5982,10 +5291,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
String get displayName => name ?? '';
@@ -6147,13 +5452,6 @@
];
}
- @Deprecated('Use children instead')
- @override
- @trackedIndirectly
- List<Element> get children2 {
- return children;
- }
-
@override
@trackedDirectlyExpensive
List<ClassElementImpl> get classes {
@@ -6191,11 +5489,6 @@
@trackedIncludedInId
Null get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- Null get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectly
TopLevelFunctionElementImpl? get entryPoint {
@@ -6208,13 +5501,6 @@
_entryPoint = value;
}
- @Deprecated('Use entryPoint instead')
- @override
- @trackedIndirectly
- TopLevelFunctionElementImpl? get entryPoint2 {
- return entryPoint;
- }
-
@override
@trackedDirectlyExpensive
List<EnumElementImpl> get enums {
@@ -6238,13 +5524,6 @@
.toList();
}
- @Deprecated('Use exportedLibraries instead')
- @override
- @trackedIndirectly
- List<LibraryElementImpl> get exportedLibraries2 {
- return exportedLibraries;
- }
-
@override
@trackedDirectly
Namespace get exportNamespace {
@@ -6411,11 +5690,6 @@
@trackedIncludedInId
LibraryElementImpl get library => this;
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElementImpl get library2 => library;
-
@trackedInternal
LibraryDeclarations get libraryDeclarations {
return _libraryDeclarations ??= LibraryDeclarations(this);
@@ -6427,13 +5701,6 @@
return loadLibraryProvider.getElement(this);
}
- @Deprecated('Use loadLibraryFunction instead')
- @override
- @trackedIndirectly
- TopLevelFunctionElementImpl get loadLibraryFunction2 {
- return loadLibraryFunction;
- }
-
@override
@trackedIncludedInId
String? get lookupName => null;
@@ -6450,11 +5717,6 @@
_metadata = value;
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedDirectlyExpensive
List<MixinElementImpl> get mixins {
@@ -6477,11 +5739,6 @@
_name = name;
}
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@trackedDirectlyOpaque
int get nameLength {
globalResultRequirements?.recordOpaqueApiUse(this, 'nameLength');
@@ -6615,11 +5872,6 @@
return visitor.visitLibraryElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@trackedInternal
void addClass(ClassElementImpl element) {
_classes.add(element);
@@ -6671,19 +5923,6 @@
builder.writeLibraryElement(this);
}
- @Deprecated('Use displayString instead')
- @override
- @trackedIndirectly
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
-
@override
@trackedDirectly
ClassElementImpl? getClass(String name) {
@@ -6697,13 +5936,6 @@
});
}
- @Deprecated('Use getClass instead')
- @override
- @trackedIndirectly
- ClassElementImpl? getClass2(String name) {
- return getClass(name);
- }
-
@override
@trackedDirectly
EnumElement? getEnum(String name) {
@@ -6714,13 +5946,6 @@
});
}
- @Deprecated('Use getEnum instead')
- @override
- @trackedIndirectly
- EnumElement? getEnum2(String name) {
- return getEnum(name);
- }
-
@override
@trackedIndirectly
String getExtendedDisplayName({String? shortName}) {
@@ -6729,13 +5954,6 @@
return "$shortName (${source.fullName})";
}
- @Deprecated('Use getExtendedDisplayName instead')
- @override
- @trackedIndirectly
- String getExtendedDisplayName2({String? shortName}) {
- return getExtendedDisplayName(shortName: shortName);
- }
-
@override
@trackedDirectly
ExtensionElement? getExtension(String name) {
@@ -6788,13 +6006,6 @@
});
}
- @Deprecated('Use getMixin instead')
- @override
- @trackedIndirectly
- MixinElement? getMixin2(String name) {
- return getMixin(name);
- }
-
@override
@trackedDirectly
SetterElement? getSetter(String name) {
@@ -6853,13 +6064,6 @@
return true;
}
- @Deprecated('Use isAccessibleIn instead')
- @override
- @trackedIndirectly
- bool isAccessibleIn2(LibraryElement library) {
- return isAccessibleIn(library);
- }
-
/// Return `true` if [reference] comes only from deprecated exports.
@trackedInternal
bool isFromDeprecatedExport(ExportedReference reference) {
@@ -6898,28 +6102,12 @@
return predicate(this) ? this : null;
}
- @Deprecated('Use thisOrAncestorMatching instead')
- @override
- @trackedIndirectly
- LibraryElementImpl? thisOrAncestorMatching2(
- bool Function(Element) predicate,
- ) {
- return thisOrAncestorMatching(predicate);
- }
-
@override
@trackedIncludedInId
E? thisOrAncestorOfType<E extends Element>() {
return E is LibraryElement ? this as E : null;
}
- @Deprecated('Use thisOrAncestorOfType instead')
- @override
- @trackedIndirectly
- E? thisOrAncestorOfType2<E extends Element>() {
- return thisOrAncestorOfType();
- }
-
@override
@trackedDirectlyOpaque
void visitChildren<T>(ElementVisitor2<T> visitor) {
@@ -6983,12 +6171,6 @@
return null;
}
- @Deprecated('Use exportedLibrary instead')
- @override
- LibraryElementImpl? get exportedLibrary2 {
- return exportedLibrary;
- }
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeLibraryExport(this);
@@ -7066,12 +6248,6 @@
return scope.accessibleExtensions;
}
- @Deprecated('Use accessibleExtensions instead')
- @override
- List<ExtensionElement> get accessibleExtensions2 {
- return accessibleExtensions;
- }
-
List<PropertyAccessorFragmentImpl> get accessors {
return [...getters, ...setters];
}
@@ -7092,12 +6268,6 @@
];
}
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 {
- return children;
- }
-
@override
List<ClassFragmentImpl> get classes => _classes;
@@ -7109,10 +6279,6 @@
_classes = classes;
}
- @Deprecated('Use classes instead')
- @override
- List<ClassFragment> get classes2 => classes;
-
@override
LibraryElementImpl get element => library;
@@ -7136,10 +6302,6 @@
_enums = enums;
}
- @Deprecated('Use enums instead')
- @override
- List<EnumFragment> get enums2 => enums;
-
@override
List<ExtensionFragmentImpl> get extensions => _extensions;
@@ -7152,10 +6314,6 @@
_extensions = extensions;
}
- @Deprecated('Use extensions instead')
- @override
- List<ExtensionFragment> get extensions2 => extensions;
-
@override
List<ExtensionTypeFragmentImpl> get extensionTypes => _extensionTypes;
@@ -7166,10 +6324,6 @@
_extensionTypes = elements;
}
- @Deprecated('Use extensionTypes instead')
- @override
- List<ExtensionTypeFragment> get extensionTypes2 => extensionTypes;
-
@override
List<TopLevelFunctionFragmentImpl> get functions {
return _functions;
@@ -7184,10 +6338,6 @@
_functions = functions;
}
- @Deprecated('Use functions instead')
- @override
- List<TopLevelFunctionFragment> get functions2 => functions;
-
@override
List<GetterFragmentImpl> get getters => _getters;
@@ -7210,12 +6360,6 @@
.toList();
}
- @Deprecated('Use importedLibraries instead')
- @override
- List<LibraryElement> get importedLibraries2 {
- return importedLibraries;
- }
-
@override
List<LibraryExportImpl> get libraryExports {
_ensureReadResolution();
@@ -7229,10 +6373,6 @@
_libraryExports = exports;
}
- @Deprecated('Use libraryExports instead')
- @override
- List<LibraryExport> get libraryExports2 => libraryExports;
-
@override
LibraryFragmentImpl get libraryFragment => this;
@@ -7249,10 +6389,6 @@
_libraryImports = imports;
}
- @Deprecated('Use libraryImports instead')
- @override
- List<LibraryImport> get libraryImports2 => libraryImports;
-
@override
List<MixinFragmentImpl> get mixins => _mixins;
@@ -7264,17 +6400,9 @@
_mixins = mixins;
}
- @Deprecated('Use mixins instead')
- @override
- List<MixinFragment> get mixins2 => mixins;
-
@override
String? get name => null;
- @Deprecated('Use name instead')
- @override
- String? get name2 => name;
-
@override
int? get nameOffset => null;
@@ -7356,10 +6484,6 @@
_variables = variables;
}
- @Deprecated('Use topLevelVariables instead')
- @override
- List<TopLevelVariableFragment> get topLevelVariables2 => topLevelVariables;
-
@override
List<TypeAliasFragmentImpl> get typeAliases {
return _typeAliases;
@@ -7373,10 +6497,6 @@
_typeAliases = typeAliases;
}
- @Deprecated('Use typeAliases instead')
- @override
- List<TypeAliasFragment> get typeAliases2 => typeAliases;
-
void addClass(ClassFragmentImpl fragment) {
if (identical(_classes, _Sentinel.classFragment)) {
_classes = [];
@@ -7569,12 +6689,6 @@
return null;
}
- @Deprecated('Use importedLibrary instead')
- @override
- LibraryElementImpl? get importedLibrary2 {
- return importedLibrary;
- }
-
@override
Namespace get namespace {
var uri = this.uri;
@@ -7589,10 +6703,6 @@
return Namespace.EMPTY;
}
- @Deprecated('Use prefix instead')
- @override
- PrefixFragment? get prefix2 => prefix;
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeLibraryImport(this);
@@ -7634,10 +6744,6 @@
// Local functions belong to Fragments, not Elements.
Element? get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
LocalFunctionFragmentImpl get firstFragment => _firstFragment;
@@ -7654,10 +6760,6 @@
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
List<LocalFunctionFragmentImpl> get _fragments {
return [
@@ -7675,21 +6777,10 @@
return visitor.visitLocalFunctionElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeLocalFunctionElement(this);
}
-
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) => displayString(multiline: multiline, preferTypeAlias: preferTypeAlias);
}
/// A concrete implementation of a [LocalFunctionFragment].
@@ -7732,10 +6823,6 @@
return _firstFragment.enclosingFragment.element;
}
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
LocalVariableFragmentImpl get firstFragment => _firstFragment;
@@ -7768,24 +6855,12 @@
@override
LibraryElementImpl get library => super.library!;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl get library2 => library;
-
@override
MetadataImpl get metadata => _firstFragment.metadata;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
List<LocalVariableFragmentImpl> get _fragments {
return [_firstFragment];
@@ -7795,22 +6870,6 @@
T? accept<T>(ElementVisitor2<T> visitor) {
return visitor.visitLocalVariableElement(this);
}
-
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
}
class LocalVariableFragmentImpl extends NonParameterVariableFragmentImpl
@@ -7838,10 +6897,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
LocalVariableElementImpl get element => _element2;
@@ -8306,11 +7361,6 @@
return _firstFragment.enclosingFragment.element;
}
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- Element? get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
MethodFragmentImpl get firstFragment {
@@ -8349,11 +7399,6 @@
return name;
}
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
List<MethodFragmentImpl> get _fragments {
return [
@@ -8373,11 +7418,6 @@
return visitor.visitMethodElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -8565,34 +7605,12 @@
return visitor.visitMixinElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeMixinElement(this);
}
- @Deprecated('Use isImplementableOutside instead')
- @override
- @trackedIndirectly
- bool isImplementableIn(LibraryElement library) {
- if (library == this.library) {
- return true;
- }
- return !isBase;
- }
-
- @Deprecated('Use isImplementableOutside instead')
- @override
- @trackedIndirectly
- bool isImplementableIn2(LibraryElement library) {
- return isImplementableIn(library);
- }
-
@trackedInternal
void linkFragments(List<MixinFragmentImpl> fragments) {
assert(identical(fragments[0], _firstFragment));
@@ -8624,10 +7642,6 @@
/// given [offset] in the file that contains the declaration of this element.
MixinFragmentImpl({required super.name});
- @Deprecated('Use InterfaceElement.mixins instead')
- @override
- List<InterfaceTypeImpl> get mixins => const [];
-
@override
MixinFragmentImpl? get nextFragment =>
super.nextFragment as MixinFragmentImpl?;
@@ -8641,10 +7655,6 @@
return element.superclassConstraints;
}
- @Deprecated('Use InterfaceElement.supertype instead')
- @override
- InterfaceTypeImpl? get supertype => null;
-
void addFragment(MixinFragmentImpl fragment) {
fragment.element = element;
fragment.previousFragment = this;
@@ -8804,24 +7814,12 @@
@override
List<Element> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Element> get children2 => children;
-
- @Deprecated('Use conflictingElements instead')
- @override
- List<Element> get conflictingElements2 => conflictingElements;
-
@override
String get displayName => name;
@override
Null get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- Null get enclosingElement2 => enclosingElement;
-
@override
MultiplyDefinedFragmentImpl get firstFragment => _firstFragment;
@@ -8849,14 +7847,6 @@
@override
LibraryElementImpl get library => libraryFragment.element;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2 => library;
-
- @Deprecated('Use name instead')
- @override
- String get name3 => name;
-
@override
Element get nonSynthetic => this;
@@ -8865,10 +7855,6 @@
return visitor.visitMultiplyDefinedElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
String displayString({bool multiline = false, bool preferTypeAlias = false}) {
var elementsStr = conflictingElements
@@ -8879,18 +7865,6 @@
return '[$elementsStr]';
}
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
-
@override
bool isAccessibleIn(LibraryElement library) {
for (var element in conflictingElements) {
@@ -8901,34 +7875,16 @@
return false;
}
- @Deprecated('Use isAccessibleIn instead')
- @override
- bool isAccessibleIn2(LibraryElement library) {
- return isAccessibleIn(library);
- }
-
@override
Element? thisOrAncestorMatching(bool Function(Element p1) predicate) {
return null;
}
- @Deprecated('Use thisOrAncestorMatching instead')
- @override
- Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
- return thisOrAncestorMatching(predicate);
- }
-
@override
E? thisOrAncestorOfType<E extends Element>() {
return null;
}
- @Deprecated('Use thisOrAncestorOfType instead')
- @override
- E? thisOrAncestorOfType2<E extends Element>() {
- return thisOrAncestorOfType();
- }
-
@override
String toString() {
StringBuffer buffer = StringBuffer();
@@ -8968,10 +7924,6 @@
@override
List<Fragment> get children => [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
String? get documentationComment => null;
@@ -8987,17 +7939,9 @@
@override
String? get name => element.name;
- @Deprecated('Use name instead')
- @override
- String? get name2 => name;
-
@override
Null get nameOffset => null;
- @Deprecated('Use nameOffset instead')
- @override
- int? get nameOffset2 => nameOffset;
-
@override
Null get nextFragment => null;
@@ -9009,10 +7953,7 @@
}
/// The synthetic element representing the declaration of the type `Never`.
-class NeverElementImpl extends ElementImpl
- implements
- TypeDefiningElement // ignore:deprecated_member_use_from_same_package
- {
+class NeverElementImpl extends ElementImpl {
/// The unique instance of this class.
static final instance = NeverElementImpl._();
@@ -9024,10 +7965,6 @@
@override
Element? get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
NeverFragmentImpl get firstFragment => _firstFragment;
@@ -9045,26 +7982,14 @@
@override
Null get library => null;
- @Deprecated('Use library instead')
- @override
- Null get library2 => library;
-
@override
MetadataImpl get metadata {
return MetadataImpl(const []);
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String get name => 'Never';
- @Deprecated('Use name instead')
- @override
- String get name3 => name;
-
@override
NeverFragmentImpl get _firstFragment => NeverFragmentImpl.instance;
@@ -9073,10 +7998,6 @@
return null;
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeNeverElement(this);
@@ -9096,10 +8017,7 @@
}
/// The synthetic element representing the declaration of the type `Never`.
-class NeverFragmentImpl extends FragmentImpl
- implements
- TypeDefiningFragment // ignore:deprecated_member_use_from_same_package
- {
+class NeverFragmentImpl extends FragmentImpl {
/// The unique instance of this class.
static final instance = NeverFragmentImpl._();
@@ -9114,10 +8032,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
NeverElementImpl get element => NeverElementImpl.instance;
@@ -9127,17 +8041,9 @@
@override
Null get libraryFragment => null;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String get name => 'Never';
- @Deprecated('Use name instead')
- @override
- String get name2 => name;
-
@override
Null get nameOffset => null;
@@ -9232,12 +8138,6 @@
return _firstFragment.join?.asElement2;
}
- @Deprecated('Use join instead')
- @override
- JoinPatternVariableElementImpl? get join2 {
- return join;
- }
-
/// Return the root [join], or self.
PatternVariableElementImpl get rootVariable {
return join?.rootVariable ?? this;
@@ -9277,10 +8177,6 @@
PatternVariableElementImpl get element =>
super.element as PatternVariableElementImpl;
- @Deprecated('Use join instead')
- @override
- JoinPatternVariableFragment? get join2 => join;
-
@override
PatternVariableFragmentImpl? get nextFragment =>
super.nextFragment as PatternVariableFragmentImpl?;
@@ -9318,10 +8214,6 @@
@override
Null get enclosingElement => null;
- @Deprecated('Use enclosingElement instead')
- @override
- Null get enclosingElement2 => enclosingElement;
-
@override
PrefixFragmentImpl get firstFragment => _firstFragment;
@@ -9353,17 +8245,9 @@
@override
LibraryElementImpl get library => super.library!;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl get library2 => library;
-
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
PrefixScope get scope {
_firstFragment.enclosingFragment.scope;
@@ -9380,10 +8264,6 @@
return visitor.visitPrefixElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
void addFragment(PrefixFragmentImpl fragment) {
lastFragment.nextFragment = fragment;
fragment.previousFragment = lastFragment;
@@ -9395,18 +8275,6 @@
builder.writePrefixElement(this);
}
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
-
@override
void visitChildren<T>(ElementVisitor2<T> visitor) {}
}
@@ -9443,10 +8311,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
LibraryFragmentImpl get enclosingFragment =>
super.enclosingFragment as LibraryFragmentImpl;
@@ -9470,11 +8334,6 @@
@trackedIncludedInId
Element get enclosingElement => _firstFragment.enclosingFragment.element;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- Element get enclosingElement2 => enclosingElement;
-
@override
PropertyAccessorFragmentImpl get firstFragment;
@@ -9492,11 +8351,6 @@
@trackedIncludedInId
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
List<TypeParameterElementImpl> get typeParameters;
@@ -9514,13 +8368,6 @@
set variable(PropertyInducingElementImpl? value) {
_variable3 = value;
}
-
- @Deprecated('Use variable instead')
- @override
- @trackedIndirectly
- PropertyInducingElementImpl? get variable3 {
- return variable;
- }
}
sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
@@ -9598,11 +8445,6 @@
return _fragments;
}
- @Deprecated('Use getter instead')
- @override
- @trackedIndirectly
- GetterElementImpl? get getter2 => getter;
-
@override
@trackedIncludedInId
bool get hasInitializer {
@@ -9632,11 +8474,6 @@
@override
Reference get reference;
- @Deprecated('Use setter instead')
- @override
- @trackedIndirectly
- SetterElementImpl? get setter2 => setter;
-
@trackedIncludedInId
bool get shouldUseTypeForInitializerInference {
return hasModifier(Modifier.SHOULD_USE_TYPE_FOR_INITIALIZER_INFERENCE);
@@ -9731,10 +8568,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
PropertyInducingElementImpl get element;
@@ -9755,10 +8588,6 @@
LibraryFragmentImpl get libraryFragment {
return enclosingFragment.libraryFragment!;
}
-
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
}
@elementClass
@@ -9790,22 +8619,10 @@
return variable.getter;
}
- @Deprecated('Use correspondingGetter instead')
- @override
- @trackedIndirectly
- GetterElement? get correspondingGetter2 {
- return correspondingGetter;
- }
-
@override
@trackedIncludedInId
Element get enclosingElement => _firstFragment.enclosingFragment.element;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- Element get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
SetterFragmentImpl get firstFragment {
@@ -9883,11 +8700,6 @@
return visitor.visitSetterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -10040,12 +8852,6 @@
return null;
}
- @Deprecated('Use superConstructorParameter instead')
- @override
- InternalFormalParameterElement? get superConstructorParameter2 {
- return superConstructorParameter;
- }
-
@override
SuperFormalParameterFragmentImpl get _firstFragment =>
super._firstFragment as SuperFormalParameterFragmentImpl;
@@ -10161,11 +8967,6 @@
@trackedIncludedInId
LibraryElementImpl get enclosingElement => library;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- LibraryElementImpl get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
TopLevelFunctionFragmentImpl get firstFragment {
@@ -10203,20 +9004,10 @@
return super.lastFragment as TopLevelFunctionFragmentImpl;
}
- @Deprecated('Use library instead')
- @override
- @trackedIncludedInId
- LibraryElementImpl get library2 => library;
-
@override
@trackedIncludedInId
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
List<TopLevelFunctionFragmentImpl> get _fragments {
return [
@@ -10236,11 +9027,6 @@
return visitor.visitTopLevelFunctionElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -10317,11 +9103,6 @@
@trackedIncludedInId
LibraryElementImpl get enclosingElement => library;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- LibraryElement get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
TopLevelVariableFragmentImpl get firstFragment {
@@ -10380,11 +9161,6 @@
return current;
}
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElement get library2 => library;
-
@override
@trackedIncludedInId
MetadataImpl get metadata {
@@ -10395,20 +9171,10 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedIncludedInId
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
List<TopLevelVariableFragmentImpl> get _fragments {
return [
@@ -10428,11 +9194,6 @@
return visitor.visitTopLevelVariableElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@trackedInternal
void linkFragments(List<TopLevelVariableFragmentImpl> fragments) {
assert(identical(fragments[0], _firstFragment));
@@ -10503,26 +9264,6 @@
_firstFragment.element = this;
}
- @Deprecated('Use aliasedType instead')
- @override
- @trackedIncludedInId
- ElementImpl? get aliasedElement {
- switch (_firstFragment.aliasedElement) {
- case InstanceFragmentImpl instance:
- return instance.element;
- case GenericFunctionTypeFragmentImpl instance:
- return instance.element;
- }
- return null;
- }
-
- @Deprecated('Use aliasedElement instead')
- @override
- @trackedIndirectly
- Element? get aliasedElement2 {
- return aliasedElement;
- }
-
@override
@trackedIncludedInId
TypeImpl get aliasedType {
@@ -10548,11 +9289,6 @@
@trackedIncludedInId
LibraryElementImpl get enclosingElement => library;
- @Deprecated('Use enclosingElement instead')
- @override
- @trackedIndirectly
- LibraryElement get enclosingElement2 => enclosingElement;
-
@override
@trackedDirectlyOpaque
TypeAliasFragmentImpl get firstFragment {
@@ -10629,11 +9365,6 @@
@trackedIncludedInId
LibraryElementImpl get library => super.library!;
- @Deprecated('Use library instead')
- @override
- @trackedIndirectly
- LibraryElementImpl get library2 => library;
-
@override
@trackedIncludedInId
MetadataImpl get metadata {
@@ -10644,20 +9375,10 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- @trackedIndirectly
- MetadataImpl get metadata2 => metadata;
-
@override
@trackedIncludedInId
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- @trackedIndirectly
- String? get name3 => name;
-
@override
@trackedIncludedInId
List<TypeParameterElementImpl> get typeParameters {
@@ -10666,11 +9387,6 @@
.toList();
}
- @Deprecated('Use typeParameters instead')
- @override
- @trackedIndirectly
- List<TypeParameterElementImpl> get typeParameters2 => typeParameters;
-
List<TypeAliasFragmentImpl> get _fragments {
return [
for (
@@ -10689,11 +9405,6 @@
return visitor.visitTypeAliasElement(this);
}
- @Deprecated('Use accept instead')
- @override
- @trackedIndirectly
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
@trackedIndirectly
void appendTo(ElementDisplayStringBuilder builder) {
@@ -10837,10 +9548,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
String get displayName => name ?? '';
@@ -10857,10 +9564,6 @@
return super.metadata;
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
int get offset => nameOffset ?? firstTokenOffset!;
@@ -10876,10 +9579,6 @@
}
_typeParameters = typeParameters;
}
-
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterFragmentImpl> get typeParameters2 => typeParameters;
}
class TypeParameterElementImpl extends ElementImpl
@@ -10925,10 +9624,6 @@
return _firstFragment.enclosingFragment?.element;
}
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
TypeParameterFragmentImpl get firstFragment => _firstFragment;
@@ -10957,10 +9652,6 @@
@override
ElementKind get kind => ElementKind.TYPE_PARAMETER;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl? get library2 => library;
-
@override
MetadataImpl get metadata {
var annotations = <ElementAnnotationImpl>[];
@@ -10970,17 +9661,9 @@
return MetadataImpl(annotations);
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String? get name => _firstFragment.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
shared.Variance get variance {
return _variance ?? shared.Variance.covariant;
@@ -10993,10 +9676,6 @@
return visitor.visitTypeParameterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeTypeParameterElement(this);
@@ -11097,10 +9776,6 @@
@override
List<Fragment> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Fragment> get children3 => children;
-
@override
String get displayName => name ?? '';
@@ -11129,10 +9804,6 @@
return enclosingFragment?.libraryFragment;
}
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
int get offset =>
nameOffset ?? firstTokenOffset ?? enclosingFragment?.offset ?? -1;
diff --git a/pkg/analyzer/lib/src/dart/element/member.dart b/pkg/analyzer/lib/src/dart/element/member.dart
index f60b2bb..d058210 100644
--- a/pkg/analyzer/lib/src/dart/element/member.dart
+++ b/pkg/analyzer/lib/src/dart/element/member.dart
@@ -16,18 +16,6 @@
import 'package:analyzer/src/utilities/extensions/element.dart';
import 'package:pub_semver/pub_semver.dart';
-@Deprecated('Use SubstitutedExecutableElementImpl instead')
-typedef ExecutableMember = SubstitutedExecutableElementImpl;
-
-@Deprecated('Use SubstitutedFieldElementImpl instead')
-typedef FieldMember = SubstitutedFieldElementImpl;
-
-@Deprecated('Use SubstitutedElementImpl instead')
-typedef Member = SubstitutedElementImpl;
-
-@Deprecated('Use SubstitutedFormalParameterElementImpl instead')
-typedef ParameterMember = SubstitutedFormalParameterElementImpl;
-
/// A constructor element defined in a parameterized type where the values of
/// the type parameters are known.
class SubstitutedConstructorElementImpl extends SubstitutedExecutableElementImpl
@@ -45,10 +33,6 @@
@override
InterfaceElementImpl get enclosingElement => baseElement.enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- InterfaceElementImpl get enclosingElement2 => enclosingElement;
-
@override
ConstructorFragmentImpl get firstFragment => baseElement.firstFragment;
@@ -77,22 +61,12 @@
@override
LibraryElementImpl get library => baseElement.library;
- @Deprecated('Use library instead')
- @override
- LibraryElementImpl get library2 => library;
-
@override
InternalConstructorElement? get redirectedConstructor {
var element = baseElement.redirectedConstructor;
return _redirect(element);
}
- @Deprecated('Use redirectedConstructor instead')
- @override
- InternalConstructorElement? get redirectedConstructor2 {
- return redirectedConstructor;
- }
-
@override
InterfaceTypeImpl get returnType {
var returnType = baseElement.returnType;
@@ -107,21 +81,11 @@
return _redirect(baseElement.superConstructor);
}
- @Deprecated('Use superConstructor instead')
- @override
- InternalConstructorElement? get superConstructor2 {
- return superConstructor;
- }
-
@override
T? accept<T>(ElementVisitor2<T> visitor) {
return visitor.visitConstructorElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeConstructorElement(this);
@@ -212,17 +176,9 @@
@override
String? get name => baseElement.name;
- @Deprecated('Use name instead')
- @override
- String? get name3 => name;
-
@override
Element get nonSynthetic => baseElement;
- @Deprecated('Use nonSynthetic instead')
- @override
- Element get nonSynthetic2 => nonSynthetic;
-
@override
AnalysisSession? get session => baseElement.session;
@@ -234,23 +190,11 @@
return baseElement.getExtendedDisplayName(shortName: shortName);
}
- @Deprecated('Use getExtendedDisplayName instead')
- @override
- String getExtendedDisplayName2({String? shortName}) {
- return getExtendedDisplayName(shortName: shortName);
- }
-
@override
bool isAccessibleIn(LibraryElement library) {
return baseElement.isAccessibleIn(library);
}
- @Deprecated('Use isAccessibleIn instead')
- @override
- bool isAccessibleIn2(LibraryElement library) {
- return isAccessibleIn(library);
- }
-
@override
bool isDeprecatedWithKind(String kind) =>
baseElement.isDeprecatedWithKind(kind);
@@ -260,23 +204,11 @@
return baseElement.thisOrAncestorMatching(predicate);
}
- @Deprecated('Use thisOrAncestorMatching instead')
- @override
- Element? thisOrAncestorMatching2(bool Function(Element e) predicate) {
- return thisOrAncestorMatching(predicate);
- }
-
@override
E? thisOrAncestorOfType<E extends Element>() {
return baseElement.thisOrAncestorOfType<E>();
}
- @Deprecated('Use thisOrAncestorOfType instead')
- @override
- E? thisOrAncestorOfType2<E extends Element>() {
- return thisOrAncestorOfType();
- }
-
@override
String toString() {
var builder = ElementDisplayStringBuilder(preferTypeAlias: false);
@@ -308,22 +240,12 @@
return [...typeParameters, ...formalParameters];
}
- @Deprecated('Use children instead')
- @override
- List<Element> get children2 {
- return children;
- }
-
@override
String? get documentationComment => baseElement.documentationComment;
@override
Element? get enclosingElement => baseElement.enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
ExecutableFragmentImpl get firstFragment;
@@ -378,17 +300,9 @@
@override
LibraryElement get library => baseElement.library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2 => library;
-
@override
MetadataImpl get metadata => baseElement.metadata;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
TypeImpl get returnType {
var result = baseElement.returnType;
@@ -401,10 +315,6 @@
return _type ??= substitution.mapFunctionType(baseElement.type);
}
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterElementImpl> get typeParameters2 => typeParameters;
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeExecutableElement(this, displayName);
@@ -420,18 +330,6 @@
return builder.toString();
}
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
-
@override
void visitChildren<T>(ElementVisitor2<T> visitor) {
for (var child in children) {
@@ -439,12 +337,6 @@
}
}
- @Deprecated('Use visitChildren instead')
- @override
- void visitChildren2<T>(ElementVisitor2<T> visitor) {
- return visitChildren(visitor);
- }
-
static InternalExecutableElement from(
ExecutableElement element,
MapSubstitution substitution,
@@ -507,20 +399,12 @@
@override
List<Element> get children => const [];
- @Deprecated('Use children instead')
- @override
- List<Element> get children2 => children;
-
@override
String? get documentationComment => baseElement.documentationComment;
@override
InstanceElement get enclosingElement => baseElement.enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- InstanceElement get enclosingElement2 => enclosingElement;
-
@override
FieldFragmentImpl get firstFragment => baseElement.firstFragment;
@@ -541,12 +425,6 @@
);
}
- @Deprecated('Use getter instead')
- @override
- InternalGetterElement? get getter2 {
- return getter;
- }
-
@override
bool get hasInitializer => baseElement.hasInitializer;
@@ -568,17 +446,9 @@
@override
LibraryElementImpl get library => baseElement.library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2 => library;
-
@override
MetadataImpl get metadata => baseElement.metadata;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
InternalSetterElement? get setter {
var baseSetter = baseElement.setter;
@@ -591,12 +461,6 @@
);
}
- @Deprecated('Use setter instead')
- @override
- InternalSetterElement? get setter2 {
- return setter;
- }
-
@override
Version? get sinceSdkVersion => baseElement.sinceSdkVersion;
@@ -605,19 +469,9 @@
return visitor.visitFieldElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void visitChildren<T>(ElementVisitor2<T> visitor) {}
- @Deprecated('Use visitChildren instead')
- @override
- void visitChildren2<T>(ElementVisitor2<T> visitor) {
- visitChildren(visitor);
- }
-
static InternalFieldElement from(
FieldElementImpl element,
MapSubstitution substitution,
@@ -672,12 +526,6 @@
return SubstitutedFieldElementImpl.from(field, substitution);
}
- @Deprecated('Use field instead')
- @override
- FieldElement? get field2 {
- return field;
- }
-
@override
FieldFormalParameterFragmentImpl get firstFragment {
return baseElement.firstFragment;
@@ -742,12 +590,6 @@
return [...typeParameters, ...formalParameters];
}
- @Deprecated('Use children instead')
- @override
- List<Element> get children2 {
- return children;
- }
-
@override
String? get defaultValueCode => baseElement.defaultValueCode;
@@ -757,10 +599,6 @@
@override
Element? get enclosingElement => baseElement.enclosingElement;
- @Deprecated('Use enclosingElement instead')
- @override
- Element? get enclosingElement2 => enclosingElement;
-
@override
FormalParameterFragmentImpl get firstFragment => baseElement.firstFragment;
@@ -812,17 +650,9 @@
@override
LibraryElement? get library => baseElement.library;
- @Deprecated('Use library instead')
- @override
- LibraryElement? get library2 => library;
-
@override
MetadataImpl get metadata => baseElement.metadata;
- @Deprecated('Use metadata instead')
- @override
- MetadataImpl get metadata2 => metadata;
-
@override
String get nameShared => name!;
@@ -835,10 +665,6 @@
@override
Version? get sinceSdkVersion => baseElement.sinceSdkVersion;
- @Deprecated('Use typeParameters instead')
- @override
- List<TypeParameterElementImpl> get typeParameters2 => typeParameters;
-
@override
TypeImpl get typeShared => type;
@@ -847,10 +673,6 @@
return visitor.visitFormalParameterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeFormalParameterElement(this);
@@ -861,12 +683,6 @@
baseElement.visitChildren(visitor);
}
- @Deprecated('Use visitChildren instead')
- @override
- void visitChildren2<T>(ElementVisitor2<T> visitor) {
- visitChildren(visitor);
- }
-
static InternalFormalParameterElement from(
InternalFormalParameterElement element,
MapSubstitution substitution,
@@ -923,12 +739,6 @@
);
}
- @Deprecated('Use correspondingSetter instead')
- @override
- InternalSetterElement? get correspondingSetter2 {
- return correspondingSetter;
- }
-
@override
GetterFragmentImpl get firstFragment => baseElement.firstFragment;
@@ -951,10 +761,6 @@
return visitor.visitGetterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
static InternalGetterElement forSubstitution(
InternalGetterElement element,
MapSubstitution substitution,
@@ -1015,10 +821,6 @@
@override
LibraryElement get library => baseElement.library;
- @Deprecated('Use library instead')
- @override
- LibraryElement get library2 => library;
-
@override
Version? get sinceSdkVersion => baseElement.sinceSdkVersion;
@@ -1027,10 +829,6 @@
return visitor.visitMethodElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
static InternalMethodElement forTargetType(
InternalMethodElement element,
InterfaceType targetType,
@@ -1081,10 +879,6 @@
return super.enclosingElement!;
}
- @Deprecated('Use enclosingElement instead')
- @override
- Element get enclosingElement2 => enclosingElement;
-
@override
PropertyAccessorFragmentImpl get firstFragment;
@@ -1105,12 +899,6 @@
}
}
- @Deprecated('Use variable instead')
- @override
- InternalPropertyInducingElement? get variable3 {
- return variable;
- }
-
@override
void appendTo(ElementDisplayStringBuilder builder) {
builder.writeExecutableElement(
@@ -1146,12 +934,6 @@
);
}
- @Deprecated('Use correspondingGetter instead')
- @override
- InternalGetterElement? get correspondingGetter2 {
- return correspondingGetter;
- }
-
@override
SetterFragmentImpl get firstFragment => baseElement.firstFragment;
@@ -1174,10 +956,6 @@
return visitor.visitSetterElement(this);
}
- @Deprecated('Use accept instead')
- @override
- T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
-
static InternalSetterElement forSubstitution(
InternalSetterElement element,
MapSubstitution substitution,
@@ -1249,12 +1027,6 @@
substitution,
);
}
-
- @Deprecated('Use superConstructorParameter instead')
- @override
- InternalFormalParameterElement? get superConstructorParameter2 {
- return superConstructorParameter;
- }
}
/// A variable element defined in a parameterized type where the values of the
@@ -1318,18 +1090,6 @@
preferTypeAlias: preferTypeAlias,
);
}
-
- @Deprecated('Use displayString instead')
- @override
- String displayString2({
- bool multiline = false,
- bool preferTypeAlias = false,
- }) {
- return displayString(
- multiline: multiline,
- preferTypeAlias: preferTypeAlias,
- );
- }
}
class _SubstitutedTypeParameters {
diff --git a/pkg/analyzer/lib/src/dart/element/scope.dart b/pkg/analyzer/lib/src/dart/element/scope.dart
index 41e0a44..4a9efa1 100644
--- a/pkg/analyzer/lib/src/dart/element/scope.dart
+++ b/pkg/analyzer/lib/src/dart/element/scope.dart
@@ -767,14 +767,6 @@
final Element? setter;
ScopeLookupResultImpl({required this.getter, required this.setter});
-
- @Deprecated('Use getter instead')
- @override
- Element? get getter2 => getter;
-
- @Deprecated('Use getter instead')
- @override
- Element? get setter2 => setter;
}
class TypeParameterScope extends EnclosedScope {
diff --git a/pkg/analyzer/lib/src/dart/element/type.dart b/pkg/analyzer/lib/src/dart/element/type.dart
index 31fbf31..1ac4e10 100644
--- a/pkg/analyzer/lib/src/dart/element/type.dart
+++ b/pkg/analyzer/lib/src/dart/element/type.dart
@@ -41,10 +41,6 @@
@override
DynamicElementImpl get element => DynamicElementImpl.instance;
- @Deprecated('Use element instead')
- @override
- DynamicElementImpl get element3 => element;
-
@override
int get hashCode => 1;
@@ -215,10 +211,6 @@
@override
Null get element => null;
- @Deprecated('Use element instead')
- @override
- Null get element3 => null;
-
@override
List<InternalFormalParameterElement> get formalParameters {
return parameters;
@@ -548,10 +540,6 @@
required this.element,
required this.typeArguments,
});
-
- @Deprecated('Use element instead.')
- @override
- TypeAliasElementImpl get element2 => element;
}
/// A concrete implementation of an [InterfaceType].
@@ -646,14 +634,6 @@
}).toFixedList();
}
- @Deprecated('Use constructors instead')
- @override
- List<InternalConstructorElement> get constructors2 => constructors;
-
- @Deprecated('Use element instead')
- @override
- InterfaceElementImpl get element3 => element;
-
@override
List<InternalGetterElement> get getters {
element.getters; // record requirements
@@ -766,10 +746,6 @@
}).toFixedList();
}
- @Deprecated('Use methods instead')
- @override
- List<InternalMethodElement> get methods2 => methods;
-
@override
List<InterfaceTypeImpl> get mixins {
return _instantiateSuperTypes(element.mixins);
@@ -875,12 +851,6 @@
return null;
}
- @Deprecated('Use asInstanceOf instead')
- @override
- InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) {
- return asInstanceOf(targetElement);
- }
-
@override
InternalGetterElement? getGetter(String getterName) {
var element = this.element.getGetter(getterName);
@@ -889,12 +859,6 @@
: null;
}
- @Deprecated('Use getGetter instead')
- @override
- InternalGetterElement? getGetter2(String getterName) {
- return getGetter(getterName);
- }
-
@override
InternalMethodElement? getMethod(String methodName) {
var element = this.element.getMethod(methodName);
@@ -903,12 +867,6 @@
: null;
}
- @Deprecated('Use getMethod instead')
- @override
- InternalMethodElement? getMethod2(String methodName) {
- return getMethod(methodName);
- }
-
InternalConstructorElement? getNamedConstructor(String name) {
var base = element.getNamedConstructor(name);
return base != null
@@ -924,12 +882,6 @@
: null;
}
- @Deprecated('Use getSetter instead')
- @override
- InternalSetterElement? getSetter2(String setterName) {
- return getSetter(setterName);
- }
-
@override
InternalConstructorElement? lookUpConstructor(
String? constructorName,
@@ -951,15 +903,6 @@
return SubstitutedConstructorElementImpl.from2(constructorElement, this);
}
- @Deprecated('Use lookUpConstructor instead')
- @override
- InternalConstructorElement? lookUpConstructor2(
- String? constructorName,
- LibraryElement library,
- ) {
- return lookUpConstructor(constructorName, library);
- }
-
@override
InternalGetterElement? lookUpGetter(
String name,
@@ -998,24 +941,6 @@
return null;
}
- @Deprecated('Use lookUpGetter instead')
- @override
- InternalGetterElement? lookUpGetter3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- }) {
- return lookUpGetter(
- name,
- library,
- concrete: concrete,
- inherited: inherited,
- recoveryStatic: recoveryStatic,
- );
- }
-
@override
InternalMethodElement? lookUpMethod(
String name,
@@ -1054,24 +979,6 @@
return null;
}
- @Deprecated('Use lookUpMethod instead')
- @override
- InternalMethodElement? lookUpMethod3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- }) {
- return lookUpMethod(
- name,
- library,
- concrete: concrete,
- inherited: inherited,
- recoveryStatic: recoveryStatic,
- );
- }
-
@override
InternalSetterElement? lookUpSetter(
String name,
@@ -1110,24 +1017,6 @@
return null;
}
- @Deprecated('Use lookUpSetter instead')
- @override
- InternalSetterElement? lookUpSetter3(
- String name,
- LibraryElement library, {
- bool concrete = false,
- bool inherited = false,
- bool recoveryStatic = false,
- }) {
- return lookUpSetter(
- name,
- library,
- concrete: concrete,
- inherited: inherited,
- recoveryStatic: recoveryStatic,
- );
- }
-
@override
bool referencesAny(Set<TypeParameterElementImpl> parameters) {
return typeArguments.any((argument) => argument.referencesAny(parameters));
@@ -1179,10 +1068,6 @@
@override
Null get element => null;
- @Deprecated('Use element instead')
- @override
- Null get element3 => element;
-
@override
int get hashCode => 1;
@@ -1233,10 +1118,6 @@
@override
final NeverElementImpl element = NeverElementImpl.instance;
- @Deprecated('Use element instead')
- @override
- final NeverElementImpl element3 = NeverElementImpl.instance;
-
@override
final NullabilitySuffix nullabilitySuffix;
@@ -1358,10 +1239,6 @@
@override
Null get element => null;
- @Deprecated('Use element instead')
- @override
- Null get element3 => element;
-
@override
int get hashCode {
return Object.hash(positionalFields.length, namedFields.length);
@@ -1580,11 +1457,6 @@
@override
InterfaceTypeImpl? asInstanceOf(InterfaceElement targetElement) => null;
- @Deprecated('Use asInstanceOf instead')
- @override
- InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) =>
- asInstanceOf(targetElement);
-
@override
TypeImpl asQuestionType(bool isQuestionType) => withNullability(
isQuestionType ? NullabilitySuffix.question : NullabilitySuffix.none,
@@ -1673,10 +1545,6 @@
TypeImpl get bound =>
promotedBound ?? element.bound ?? DynamicTypeImpl.instance;
- @Deprecated('Use element instead')
- @override
- TypeParameterElementImpl get element3 => element;
-
@override
int get hashCode => element.hashCode;
@@ -1752,12 +1620,6 @@
return bound.asInstanceOf(targetElement);
}
- @Deprecated('Use asInstanceOf instead')
- @override
- InterfaceTypeImpl? asInstanceOf2(InterfaceElement targetElement) {
- return asInstanceOf(targetElement);
- }
-
@override
bool referencesAny(Set<TypeParameterElementImpl> parameters) {
return parameters.contains(element);
@@ -1785,10 +1647,6 @@
@override
Null get element => null;
- @Deprecated('Use element instead')
- @override
- Null get element3 => null;
-
@override
int get hashCode => 2;
diff --git a/pkg/analyzer/lib/src/dart/element/type_provider.dart b/pkg/analyzer/lib/src/dart/element/type_provider.dart
index 1df8f1a..21a1bbb 100644
--- a/pkg/analyzer/lib/src/dart/element/type_provider.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_provider.dart
@@ -163,12 +163,6 @@
return _boolElement ??= _getClassElement(_coreLibrary, 'bool');
}
- @Deprecated('Use boolElement instead')
- @override
- ClassElementImpl get boolElement2 {
- return boolElement;
- }
-
@override
InterfaceTypeImpl get boolType {
boolElement; // record requirement
@@ -203,12 +197,6 @@
return _doubleElement ??= _getClassElement(_coreLibrary, "double");
}
- @Deprecated('Use doubleElement instead')
- @override
- ClassElementImpl get doubleElement2 {
- return doubleElement;
- }
-
@override
InterfaceTypeImpl get doubleType {
doubleElement; // record requirement
@@ -238,12 +226,6 @@
return _enumElement;
}
- @Deprecated('Use enumElement instead.')
- @override
- ClassElementImpl? get enumElement2 {
- return enumElement;
- }
-
@override
InterfaceTypeImpl? get enumType {
enumElement; // record requirement
@@ -289,12 +271,6 @@
return _futureElement ??= _getClassElement(_asyncLibrary, 'Future');
}
- @Deprecated('Use futureElement instead.')
- @override
- ClassElementImpl get futureElement2 {
- return futureElement;
- }
-
@override
InterfaceTypeImpl get futureNullType {
futureElement; // record requirement
@@ -310,12 +286,6 @@
return _futureOrElement ??= _getClassElement(_asyncLibrary, 'FutureOr');
}
- @Deprecated('Use futureOrElement instead.')
- @override
- ClassElementImpl get futureOrElement2 {
- return futureOrElement;
- }
-
@override
InterfaceTypeImpl get futureOrNullType {
futureOrElement; // record requirement
@@ -331,12 +301,6 @@
return _intElement ??= _getClassElement(_coreLibrary, "int");
}
- @Deprecated('Use intElement instead.')
- @override
- ClassElementImpl get intElement2 {
- return intElement;
- }
-
@override
InterfaceTypeImpl get intType {
intElement; // record requirement
@@ -368,12 +332,6 @@
return _iterableElement ??= _getClassElement(_coreLibrary, 'Iterable');
}
- @Deprecated('Use iterableElement instead')
- @override
- ClassElementImpl get iterableElement2 {
- return iterableElement;
- }
-
@override
InterfaceTypeImpl get iterableObjectType {
iterableElement; // record requirement
@@ -390,24 +348,12 @@
return _listElement ??= _getClassElement(_coreLibrary, 'List');
}
- @Deprecated('Use listElement instead')
- @override
- ClassElementImpl get listElement2 {
- return listElement;
- }
-
@override
ClassElementImpl get mapElement {
_coreLibrary.recordGetDeclaredClass('Map');
return _mapElement ??= _getClassElement(_coreLibrary, 'Map');
}
- @Deprecated('Use mapElement instead')
- @override
- ClassElementImpl get mapElement2 {
- return mapElement;
- }
-
@override
InterfaceTypeImpl get mapObjectObjectType {
mapElement; // record requirement
@@ -427,12 +373,6 @@
return _nullElement ??= _getClassElement(_coreLibrary, 'Null');
}
- @Deprecated('Use nullElement instead')
- @override
- ClassElementImpl get nullElement2 {
- return nullElement;
- }
-
@override
InterfaceTypeImpl get nullType {
nullElement; // record requirement
@@ -448,12 +388,6 @@
return _numElement ??= _getClassElement(_coreLibrary, 'num');
}
- @Deprecated('Use numElement instead')
- @override
- ClassElementImpl get numElement2 {
- return numElement;
- }
-
@override
InterfaceTypeImpl get numType {
numElement; // record requirement
@@ -476,12 +410,6 @@
return _objectElement ??= _getClassElement(_coreLibrary, 'Object');
}
- @Deprecated('Use objectElement instead')
- @override
- ClassElementImpl get objectElement2 {
- return objectElement;
- }
-
@override
InterfaceTypeImpl get objectQuestionType {
objectElement; // record requirement
@@ -506,12 +434,6 @@
return _recordElement ??= _getClassElement(_coreLibrary, 'Record');
}
- @Deprecated('Use recordElement instead')
- @override
- ClassElementImpl get recordElement2 {
- return recordElement;
- }
-
@override
InterfaceTypeImpl get recordType {
recordElement; // record requirement
@@ -527,12 +449,6 @@
return _setElement ??= _getClassElement(_coreLibrary, 'Set');
}
- @Deprecated('Use setElement instead')
- @override
- ClassElementImpl get setElement2 {
- return setElement;
- }
-
ClassElementImpl get stackTraceElement {
_coreLibrary.recordGetDeclaredClass('StackTrace');
return _stackTraceElement ??= _getClassElement(_coreLibrary, 'StackTrace');
@@ -562,24 +478,12 @@
return _streamElement ??= _getClassElement(_asyncLibrary, 'Stream');
}
- @Deprecated('Use streamElement instead')
- @override
- ClassElementImpl get streamElement2 {
- return streamElement;
- }
-
@override
ClassElementImpl get stringElement {
_coreLibrary.recordGetDeclaredClass('String');
return _stringElement ??= _getClassElement(_coreLibrary, 'String');
}
- @Deprecated('Use stringElement instead')
- @override
- ClassElementImpl get stringElement2 {
- return stringElement;
- }
-
@override
InterfaceTypeImpl get stringType {
stringElement; // record requirement
@@ -595,12 +499,6 @@
return _symbolElement ??= _getClassElement(_coreLibrary, 'Symbol');
}
- @Deprecated('Use symbolElement instead')
- @override
- ClassElementImpl get symbolElement2 {
- return symbolElement;
- }
-
@override
InterfaceTypeImpl get symbolType {
symbolElement; // record requirement
@@ -654,12 +552,6 @@
return false;
}
- @Deprecated('Use isNonSubtypableClass instead')
- @override
- bool isNonSubtypableClass2(InterfaceElement element) {
- return isNonSubtypableClass(element);
- }
-
@override
InterfaceTypeImpl iterableType(covariant TypeImpl elementType) {
return iterableElement.instantiateImpl(
diff --git a/pkg/analyzer/lib/src/dart/element/type_schema.dart b/pkg/analyzer/lib/src/dart/element/type_schema.dart
index e7d58e5..3f9edd7 100644
--- a/pkg/analyzer/lib/src/dart/element/type_schema.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_schema.dart
@@ -26,10 +26,6 @@
@override
Element? get element => null;
- @Deprecated('Use element instead')
- @override
- Element? get element3 => element;
-
@override
int get hashCode => 1;
diff --git a/pkg/analyzer/lib/src/dart/element/type_system.dart b/pkg/analyzer/lib/src/dart/element/type_system.dart
index b3716af..f6ca895 100644
--- a/pkg/analyzer/lib/src/dart/element/type_system.dart
+++ b/pkg/analyzer/lib/src/dart/element/type_system.dart
@@ -701,18 +701,6 @@
);
}
- @Deprecated('Use instantiateInterfaceToBounds instead')
- @override
- InterfaceTypeImpl instantiateInterfaceToBounds2({
- required covariant InterfaceElementImpl element,
- required NullabilitySuffix nullabilitySuffix,
- }) {
- return instantiateInterfaceToBounds(
- element: element,
- nullabilitySuffix: nullabilitySuffix,
- );
- }
-
/// Given a [DartType] [type] and a list of types
/// [typeArguments], instantiate the type formals with the
/// provided actuals. If [type] is not a parameterized type,
@@ -744,18 +732,6 @@
);
}
- @Deprecated('Use instantiateTypeAliasToBounds instead')
- @override
- TypeImpl instantiateTypeAliasToBounds2({
- required covariant TypeAliasElementImpl element,
- required NullabilitySuffix nullabilitySuffix,
- }) {
- return instantiateTypeAliasToBounds(
- element: element,
- nullabilitySuffix: nullabilitySuffix,
- );
- }
-
/// Given uninstantiated [typeParameters], instantiate them to their bounds.
/// See the issue for the algorithm description.
///
diff --git a/pkg/analyzer/lib/src/error/listener.dart b/pkg/analyzer/lib/src/error/listener.dart
index 149f991..fd44191 100644
--- a/pkg/analyzer/lib/src/error/listener.dart
+++ b/pkg/analyzer/lib/src/error/listener.dart
@@ -175,7 +175,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
// TODO(brianwilkerson): Consider extending this method to take any
// declaration and compute the correct range for the name of that
@@ -204,7 +203,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
var nonSynthetic = element.nonSynthetic;
return atOffset(
@@ -213,8 +211,6 @@
length: nonSynthetic.name?.length ?? 0,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
@@ -229,7 +225,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
return atOffset(
diagnosticCode: diagnosticCode,
@@ -237,8 +232,6 @@
length: entity.length,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
@@ -253,7 +246,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
return atOffset(
diagnosticCode: diagnosticCode,
@@ -261,13 +253,10 @@
length: node.length,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
- /// Reports a diagnostic with the given [diagnosticCode] (or [errorCode],
- /// deprecated) and [arguments].
+ /// Reports a diagnostic with the given [diagnosticCode] and [arguments].
///
/// The location of the diagnostic is specified by the given [offset] and
/// [length].
@@ -277,21 +266,10 @@
Diagnostic atOffset({
required int offset,
required int length,
- @Deprecated("Use 'diagnosticCode' instead") DiagnosticCode? errorCode,
- DiagnosticCode? diagnosticCode,
+ required DiagnosticCode diagnosticCode,
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
- if ((errorCode == null && diagnosticCode == null) ||
- (errorCode != null && diagnosticCode != null)) {
- throw ArgumentError(
- "Exactly one of 'errorCode' (deprecated) and 'diagnosticCode' should be given",
- );
- }
-
- diagnosticCode ??= errorCode!;
-
if (arguments != null) {
var invalid = arguments
.whereNotType<String>()
@@ -313,8 +291,6 @@
diagnosticCode: diagnosticCode,
arguments: arguments ?? const [],
contextMessages: contextMessages ?? [],
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
reportError(diagnostic);
return diagnostic;
@@ -331,7 +307,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
return atOffset(
diagnosticCode: diagnosticCode,
@@ -339,8 +314,6 @@
length: span.length,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
@@ -355,7 +328,6 @@
DiagnosticCode diagnosticCode, {
List<Object>? arguments,
List<DiagnosticMessage>? contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
return atOffset(
diagnosticCode: diagnosticCode,
@@ -363,8 +335,6 @@
length: token.length,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use_from_same_package
- data: data,
);
}
@@ -382,7 +352,6 @@
required DiagnosticCode diagnosticCode,
required List<Object> arguments,
required List<DiagnosticMessage> contextMessages,
- @Deprecated('Use an expando instead') Object? data,
}) {
contextMessages.addAll(
convertTypeNames(
@@ -399,8 +368,6 @@
diagnosticCode: diagnosticCode,
arguments: arguments,
contextMessages: contextMessages,
- // ignore: deprecated_member_use
- data: data,
);
}
}
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index b2f1b68..f799404 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -6465,7 +6465,6 @@
metadata: metadata,
augmentKeyword: augmentKeyword,
abstractKeyword: abstractKeyword,
- macroKeyword: macroKeyword,
sealedKeyword: sealedKeyword,
baseKeyword: baseKeyword,
interfaceKeyword: interfaceKeyword,
diff --git a/pkg/analyzer/lib/utilities/extensions/ast.dart b/pkg/analyzer/lib/utilities/extensions/ast.dart
deleted file mode 100644
index 9a90ef72..0000000
--- a/pkg/analyzer/lib/utilities/extensions/ast.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:analyzer/src/dart/ast/ast.dart';
-
-@Deprecated('Use the method defined on `CompilationUnit` instead.')
-extension AstNodeExtension on AstNode {
- /// Returns the minimal covering node for the range of characters beginning at
- /// the [offset] with the given [length].
- ///
- /// Returns `null` if the range is outside the range covered by the receiver.
- ///
- /// The minimal covering node is the node, rooted at the receiver, with the
- /// shortest length whose range completely includes the given range.
- @Deprecated('Use the method defined on `CompilationUnit` instead.')
- AstNode? nodeCovering({required int offset, int length = 0}) {
- return (this as CompilationUnit).nodeCovering(
- offset: offset,
- length: length,
- );
- }
-}
diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml
index 64310cf..8b10c88 100644
--- a/pkg/analyzer/pubspec.yaml
+++ b/pkg/analyzer/pubspec.yaml
@@ -1,5 +1,5 @@
name: analyzer
-version: 8.4.0
+version: 9.0.0-dev
description: >-
This package provides a library that performs static analysis of Dart code.
repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer
diff --git a/pkg/analyzer_cli/test/mocks.dart b/pkg/analyzer_cli/test/mocks.dart
index e3548db..880801d 100644
--- a/pkg/analyzer_cli/test/mocks.dart
+++ b/pkg/analyzer_cli/test/mocks.dart
@@ -52,9 +52,6 @@
String? get correctionMessage => null;
@override
- Object? get data => throw UnimplementedError();
-
- @override
MockErrorCode get errorCode => diagnosticCode;
@override
diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml
index 07088da..7efcb70 100644
--- a/pkg/analyzer_plugin/pubspec.yaml
+++ b/pkg/analyzer_plugin/pubspec.yaml
@@ -1,6 +1,6 @@
name: analyzer_plugin
description: A framework and support code for building plugins for the analysis server.
-version: 0.13.10
+version: 0.13.11-dev
repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer_plugin
environment:
@@ -11,7 +11,7 @@
dependencies:
# See the release policy for managing this dependency at
# pkg/analyzer/doc/implementation/releasing.md.
- analyzer: 8.4.0
+ analyzer: ^9.0.0-0
collection: ^1.15.0
dart_style: ^3.0.0
pub_semver: ^2.1.0
diff --git a/pkg/analyzer_testing/pubspec.yaml b/pkg/analyzer_testing/pubspec.yaml
index 7bbb4bb..cf5a0c0 100644
--- a/pkg/analyzer_testing/pubspec.yaml
+++ b/pkg/analyzer_testing/pubspec.yaml
@@ -1,6 +1,6 @@
name: analyzer_testing
description: Testing utilities related to the analyzer and analysis_server_plugin packages.
-version: 0.1.5
+version: 0.1.6-dev
repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer_testing
environment:
@@ -11,7 +11,7 @@
dependencies:
# See the release policy for managing this dependency at
# pkg/analyzer/doc/implementation/releasing.md.
- analyzer: 8.4.0
+ analyzer: ^9.0.0-0
meta: ^1.10.0
path: ^1.9.0
test: ^1.25.0
