Elements. Remove V1 from results.

Change-Id: Ic99558ffb7bf59eebd0afc1e392209a37261480f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/422841
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/api.txt

@@ -156,7 +156,6 @@ package:analyzer/dart/analysis/results.dart:
     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 @@ package:analyzer/dart/analysis/results.dart:
     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,23 +200,20 @@ package:analyzer/dart/analysis/results.dart:
   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):
     new (constructor: ParsedUnitResult Function())
     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>)
     unitWithPath (method: ResolvedUnitResult? Function(String))
   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 @@ package:analyzer/dart/analysis/results.dart:
     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())

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 @@ class DisposedAnalysisContextResult
 /// 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 @@ abstract class InvalidResult {}
 ///
 /// 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 @@ abstract class ParsedLibraryResult
   /// 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.
@@ -282,10 +267,6 @@ abstract class ParseStringResult {
 /// Clients may not extend, implement or mix-in this class.
 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;
@@ -311,10 +292,6 @@ abstract class ResolvedUnitResult
   /// Return `true` if the file exists.
   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 @@ abstract class SomeUnitElementResult {}
 ///
 // 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;

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -926,7 +926,7 @@ class AnalysisDriver {
 
         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 @@ class AnalysisDriver {
         var result = UnitElementResultImpl(
           session: currentSession,
           fileState: file,
-          element: element,
+          fragment: element,
         );
 
         _unitElementRequestedFiles.completeAll(path, result);

pkg/analyzer/lib/src/dart/analysis/results.dart

@@ -6,7 +6,6 @@ import 'package:analyzer/dart/analysis/results.dart';
 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 @@ class ElementDeclarationResultImpl
 
   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 FileResultImpl extends AnalysisResultImpl implements FileResult {
 
 class LibraryElementResultImpl implements LibraryElementResult {
   @override
-  final LibraryElementImpl element;
-
-  LibraryElementResultImpl(this.element);
+  final LibraryElementImpl element2;
 
-  @override
-  LibraryElementImpl get element2 => element;
+  LibraryElementResultImpl(this.element2);
 }
 
 class ParsedLibraryResultImpl extends AnalysisResultImpl
@@ -298,15 +285,6 @@ class ParsedLibraryResultImpl extends AnalysisResultImpl
     required this.units,
   });
 
-  @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) {
@@ -432,22 +410,9 @@ class ResolvedLibraryResultImpl extends AnalysisResultImpl
     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) {
@@ -512,12 +477,6 @@ class ResolvedUnitResultImpl extends FileResultImpl
   @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 ResolvedUnitResultImpl extends FileResultImpl
 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;
 }

pkg/analyzer/lib/src/dart/analysis/search.dart

@@ -347,7 +347,7 @@ class Search {
       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 @@ class _FindDeclarations {
           (performance) async {
             var result = await analysisDriver.getLibraryByUri('$uri');
             if (result is LibraryElementResultImpl) {
-              return result.element;
+              return result.element2;
             }
             return null;
           },

pkg/analyzer/lib/src/dart/micro/analysis_context.dart

@@ -111,7 +111,7 @@ class _FakeAnalysisDriver implements AnalysisDriver {
     var library = kind.library ?? kind.asLibrary;
     var element = libraryContext.computeUnitElement(library, file);
     return UnitElementResultImpl(
-      element: element,
+      fragment: element,
       fileState: file,
       session: currentSession,
     );