Elements. Remove V1 from results.
Change-Id: Ic99558ffb7bf59eebd0afc1e392209a37261480f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/422841
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index d48cbb5..e31ba3c 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt
@@ -156,7 +156,6 @@
new (constructor: DisposedAnalysisContextResult Function())
ElementDeclarationResult (class extends Object, deprecated):
new (constructor: ElementDeclarationResult Function())
- element (getter: Element, deprecated)
fragment (getter: Fragment)
node (getter: AstNode)
parsedUnit (getter: ParsedUnitResult?)
@@ -185,7 +184,6 @@
new (constructor: InvalidResult Function())
LibraryElementResult (class extends Object implements SomeLibraryElementResult):
new (constructor: LibraryElementResult Function())
- element (getter: LibraryElement, deprecated)
element2 (getter: LibraryElement2, experimental)
NotElementOfThisSessionResult (class extends Object implements InvalidResult, SomeParsedLibraryResult, SomeResolvedLibraryResult):
new (constructor: NotElementOfThisSessionResult Function())
@@ -202,7 +200,6 @@
ParsedLibraryResult (class extends Object implements SomeParsedLibraryResult, AnalysisResult):
new (constructor: ParsedLibraryResult Function())
units (getter: List<ParsedUnitResult>)
- getElementDeclaration (method: ElementDeclarationResult? Function(Element), deprecated)
getElementDeclaration2 (method: ElementDeclarationResult? Function(Fragment), deprecated, experimental)
getFragmentDeclaration (method: FragmentDeclarationResult? Function(Fragment), experimental)
ParsedUnitResult (class extends Object implements SomeParsedUnitResult, AnalysisResultWithErrors):
@@ -210,7 +207,6 @@
unit (getter: CompilationUnit)
ResolvedLibraryResult (class extends Object implements ParsedLibraryResult, SomeResolvedLibraryResult):
new (constructor: ResolvedLibraryResult Function())
- element (getter: LibraryElement, deprecated)
element2 (getter: LibraryElement2, experimental)
typeProvider (getter: TypeProvider)
units (getter: List<ResolvedUnitResult>)
@@ -218,7 +214,6 @@
ResolvedUnitResult (class extends Object implements ParsedUnitResult, SomeResolvedUnitResult):
new (constructor: ResolvedUnitResult Function())
exists (getter: bool)
- libraryElement (getter: LibraryElement, deprecated)
libraryElement2 (getter: LibraryElement2, experimental)
libraryFragment (getter: LibraryFragment, experimental)
typeProvider (getter: TypeProvider)
@@ -241,7 +236,6 @@
new (constructor: SomeUnitElementResult Function())
UnitElementResult (class extends Object implements SomeUnitElementResult, FileResult):
new (constructor: UnitElementResult Function())
- element (getter: CompilationUnitElement, deprecated)
fragment (getter: LibraryFragment, experimental)
UnspecifiedInvalidResult (class extends Object implements InvalidResult, SomeLibraryElementResult, SomeParsedLibraryResult):
new (constructor: UnspecifiedInvalidResult Function())
diff --git a/pkg/analyzer/lib/dart/analysis/results.dart b/pkg/analyzer/lib/dart/analysis/results.dart
index 33b8586..cc05f86 100644
--- a/pkg/analyzer/lib/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/dart/analysis/results.dart
@@ -5,7 +5,6 @@
import 'package:analyzer/dart/analysis/analysis_options.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/type_provider.dart';
import 'package:analyzer/dart/element/type_system.dart';
@@ -59,10 +58,6 @@
/// The declaration of an [Element].
@Deprecated('Use FragmentDeclarationResult instead')
abstract class ElementDeclarationResult {
- /// The [Element] that this object describes.
- @Deprecated('Use fragment instead')
- Element get element;
-
/// The [Fragment] that this object describes.
Fragment get fragment;
@@ -167,10 +162,6 @@
///
/// Clients may not extend, implement or mix-in this class.
abstract class LibraryElementResult implements SomeLibraryElementResult {
- /// The element of the library.
- @Deprecated('Use element2 instead')
- LibraryElement get element;
-
/// The element representing the library.
@experimental
LibraryElement2 get element2;
@@ -222,12 +213,6 @@
/// The parsed units of the library.
List<ParsedUnitResult> get units;
- /// Return the declaration of the [element], or `null` if the [element]
- /// is synthetic. Throw [ArgumentError] if the [element] is not defined in
- /// this library.
- @Deprecated('Use getFragmentDeclaration() instead')
- ElementDeclarationResult? getElementDeclaration(Element element);
-
/// Returns the declaration of the [fragment].
///
/// Returns `null` if the [fragment] is synthetic.
@@ -283,10 +268,6 @@
abstract class ResolvedLibraryResult
implements ParsedLibraryResult, SomeResolvedLibraryResult {
/// The element representing this library.
- @Deprecated('Use element2 instead')
- LibraryElement get element;
-
- /// The element representing this library.
@experimental
LibraryElement2 get element2;
@@ -312,10 +293,6 @@
bool get exists;
/// The element representing the library containing the compilation [unit].
- @Deprecated('Use libraryElement2 instead')
- LibraryElement get libraryElement;
-
- /// The element representing the library containing the compilation [unit].
@experimental
LibraryElement2 get libraryElement2;
@@ -404,10 +381,6 @@
///
// TODO(scheglov): Stop implementing [FileResult].
abstract class UnitElementResult implements SomeUnitElementResult, FileResult {
- /// The element of the file.
- @Deprecated('Use fragment instead')
- CompilationUnitElement get element;
-
/// The fragment representing the content of the file.
@experimental
LibraryFragment get fragment;
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 1646c54..35e2f7a 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -926,7 +926,7 @@
var unitResult = await getUnitElement(file.path);
if (unitResult is UnitElementResultImpl) {
- return LibraryElementResultImpl(unitResult.element.library);
+ return LibraryElementResultImpl(unitResult.fragment.element);
}
// Some invalid results are invalid results for this request.
@@ -1964,7 +1964,7 @@
var result = UnitElementResultImpl(
session: currentSession,
fileState: file,
- element: element,
+ fragment: element,
);
_unitElementRequestedFiles.completeAll(path, result);
diff --git a/pkg/analyzer/lib/src/dart/analysis/results.dart b/pkg/analyzer/lib/src/dart/analysis/results.dart
index ecb1ba8..b84b227 100644
--- a/pkg/analyzer/lib/src/dart/analysis/results.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/results.dart
@@ -6,7 +6,6 @@
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/token.dart';
import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/file_system/file_system.dart';
@@ -187,15 +186,6 @@
ElementDeclarationResultImpl(
this.fragment, this.node, this.parsedUnit, this.resolvedUnit);
-
- @Deprecated('Use fragment instead')
- @override
- Element get element {
- if (fragment case Element element) {
- return element;
- }
- throw UnsupportedError('${fragment.runtimeType}');
- }
}
class ErrorsResultImpl implements ErrorsResult {
@@ -280,12 +270,9 @@
class LibraryElementResultImpl implements LibraryElementResult {
@override
- final LibraryElementImpl element;
+ final LibraryElementImpl element2;
- LibraryElementResultImpl(this.element);
-
- @override
- LibraryElementImpl get element2 => element;
+ LibraryElementResultImpl(this.element2);
}
class ParsedLibraryResultImpl extends AnalysisResultImpl
@@ -300,15 +287,6 @@
@Deprecated('Use getFragmentDeclaration() instead')
@override
- ElementDeclarationResultImpl? getElementDeclaration(Element element) {
- if (element case Fragment fragment) {
- return getFragmentDeclaration(fragment);
- }
- throw UnsupportedError('$runtimeType.getElementDeclaration($element)');
- }
-
- @Deprecated('Use getFragmentDeclaration() instead')
- @override
ElementDeclarationResultImpl? getElementDeclaration2(Fragment fragment) {
return getFragmentDeclaration(fragment);
}
@@ -432,24 +410,11 @@
required this.units,
});
- @Deprecated('Use element2 instead')
- @override
- LibraryElement get element => element2;
-
@override
TypeProviderImpl get typeProvider => element2.typeProvider;
@Deprecated('Use getFragmentDeclaration() instead')
@override
- ElementDeclarationResultImpl? getElementDeclaration(Element element) {
- if (element case Fragment fragment) {
- return getFragmentDeclaration(fragment);
- }
- throw UnsupportedError('$runtimeType.getElementDeclaration($element)');
- }
-
- @Deprecated('Use getFragmentDeclaration() instead')
- @override
ElementDeclarationResultImpl? getElementDeclaration2(Fragment fragment) {
return getFragmentDeclaration(fragment);
}
@@ -512,12 +477,6 @@
@override
bool get exists => fileState.exists;
- @Deprecated('Use libraryElement2 instead')
- @override
- LibraryElementImpl get libraryElement {
- return libraryElement2;
- }
-
@override
LibraryElementImpl get libraryElement2 {
return libraryFragment.element;
@@ -536,14 +495,11 @@
class UnitElementResultImpl extends FileResultImpl
implements UnitElementResult {
@override
- final CompilationUnitElementImpl element;
+ final CompilationUnitElementImpl fragment;
UnitElementResultImpl({
required super.session,
required super.fileState,
- required this.element,
+ required this.fragment,
});
-
- @override
- CompilationUnitElementImpl get fragment => element;
}
diff --git a/pkg/analyzer/lib/src/dart/analysis/search.dart b/pkg/analyzer/lib/src/dart/analysis/search.dart
index ad07110..8e9f894 100644
--- a/pkg/analyzer/lib/src/dart/analysis/search.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/search.dart
@@ -347,7 +347,7 @@
if (searchedFiles.add(file.path, this)) {
var libraryResult = await _driver.getLibraryByUri(file.uriStr);
if (libraryResult is LibraryElementResultImpl) {
- var element = libraryResult.element;
+ var element = libraryResult.element2;
element.classes.forEach(addElements);
element.enums.forEach(addElements);
element.extensionTypes.forEach(addElements);
@@ -1147,7 +1147,7 @@
(performance) async {
var result = await analysisDriver.getLibraryByUri('$uri');
if (result is LibraryElementResultImpl) {
- return result.element;
+ return result.element2;
}
return null;
},
diff --git a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
index c0f34e3..b6fc9b0 100644
--- a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
@@ -111,7 +111,7 @@
var library = kind.library ?? kind.asLibrary;
var element = libraryContext.computeUnitElement(library, file);
return UnitElementResultImpl(
- element: element,
+ fragment: element,
fileState: file,
session: currentSession,
);
