Elements. Remove ElementLocation.

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

Author: scheglov

pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart

@@ -9,7 +9,7 @@ import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analysis_server/src/utilities/element_location2.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element2.dart' hide ElementLocation;
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/element/element.dart';

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -1443,12 +1443,6 @@ class SuggestionBuilder {
         namedParameters,
       );
     }
-    // If element is a local variable or is a parameter of a local function,
-    // then the element location can be null.
-    ElementLocation? elementLocation;
-    if (element is! LocalVariableElement2 ||
-        (element is FormalParameterElement &&
-            element.enclosingElement2 != null)) {}
 
     return _ElementCompletionData(
       isDeprecated: element.hasOrInheritsDeprecated,
@@ -1461,7 +1455,6 @@ class SuggestionBuilder {
       documentation: documentation,
       defaultArgumentList: defaultArgumentList,
       element: suggestedElement,
-      elementLocation: elementLocation,
       colorHex: colorHex,
     );
   }
@@ -1735,7 +1728,6 @@ class _ElementCompletionData {
   CompletionDefaultArgumentList? defaultArgumentList;
   final _ElementDocumentation? documentation;
   final protocol.Element element;
-  final ElementLocation? elementLocation;
   final String? colorHex;
 
   _ElementCompletionData({
@@ -1749,7 +1741,6 @@ class _ElementCompletionData {
     required this.defaultArgumentList,
     required this.documentation,
     required this.element,
-    required this.elementLocation,
     required this.colorHex,
   });
 }

pkg/analyzer/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Remove deprecated `DartType.isStructurallyEqualTo`.
 * Remove deprecated `RecordType.positionalTypes`.
 * Remove deprecated `RecordType.sortedNamedTypes`.
+* Remove `ElementLocation` class, its values are not returned anymore.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3158,10 +3158,6 @@ package:analyzer/dart/element/element.dart:
     ordinal (getter: int)
     compareTo (method: int Function(ElementKind))
     toString (method: String Function())
-  ElementLocation (class extends Object):
-    new (constructor: ElementLocation Function())
-    components (getter: List<String>)
-    encoding (getter: String)
   ElementVisitor2 (class<R> extends Object):
     new (constructor: ElementVisitor2<R> Function())
     visitClassElement (method: R? Function(ClassElement2))
@@ -3840,7 +3836,6 @@ package:analyzer/dart/element/element2.dart:
   ElementAnnotation (see above)
   ElementDirective (see above)
   ElementKind (see above)
-  ElementLocation (see above)
   ElementVisitor2 (see above)
   EnumElement2 (see above)
   EnumFragment (see above)

pkg/analyzer/lib/dart/element/element.dart

@@ -937,20 +937,6 @@ class ElementKind implements Comparable<ElementKind> {
   String toString() => name;
 }
 
-/// The location of an element within the element model.
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class ElementLocation {
-  /// The path to the element whose location is represented by this object.
-  ///
-  /// Clients must not modify the returned array.
-  List<String> get components;
-
-  /// The encoded representation of this location that can be used to create a
-  /// location that is equal to this location.
-  String get encoding;
-}
-
 /// An object that can be used to visit an element structure.
 ///
 /// Clients may not extend, implement or mix-in this class. There are classes

pkg/analyzer/lib/src/dart/element/element.dart

@@ -2844,118 +2844,6 @@ abstract class ElementImpl2 implements Element2 {
   }
 }
 
-/// A concrete implementation of an [ElementLocation].
-class ElementLocationImpl implements ElementLocation {
-  /// The character used to separate components in the encoded form.
-  static const int _separatorChar = 0x3B;
-
-  /// The path to the element whose location is represented by this object.
-  late final List<String> _components;
-
-  /// Initialize a newly created location to represent the given [element].
-  ElementLocationImpl.con1(ElementImpl element) {
-    List<String> components = <String>[];
-    ElementImpl? ancestor = element;
-    while (ancestor != null) {
-      components.insert(0, ancestor.identifier);
-      if (ancestor is CompilationUnitElementImpl) {
-        components.insert(0, ancestor.library.identifier);
-        break;
-      }
-      ancestor = ancestor.enclosingElement3;
-    }
-    _components = components.toFixedList();
-  }
-
-  /// Initialize a newly created location from the given [encoding].
-  ElementLocationImpl.con2(String encoding) {
-    _components = _decode(encoding);
-  }
-
-  @override
-  List<String> get components => _components;
-
-  @override
-  String get encoding {
-    StringBuffer buffer = StringBuffer();
-    int length = _components.length;
-    for (int i = 0; i < length; i++) {
-      if (i > 0) {
-        buffer.writeCharCode(_separatorChar);
-      }
-      _encode(buffer, _components[i]);
-    }
-    return buffer.toString();
-  }
-
-  @override
-  int get hashCode => Object.hashAll(_components);
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) {
-      return true;
-    }
-    if (other is ElementLocationImpl) {
-      List<String> otherComponents = other._components;
-      int length = _components.length;
-      if (otherComponents.length != length) {
-        return false;
-      }
-      for (int i = 0; i < length; i++) {
-        if (_components[i] != otherComponents[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
-    return false;
-  }
-
-  @override
-  String toString() => encoding;
-
-  /// Decode the [encoding] of a location into a list of components and return
-  /// the components.
-  List<String> _decode(String encoding) {
-    List<String> components = <String>[];
-    StringBuffer buffer = StringBuffer();
-    int index = 0;
-    int length = encoding.length;
-    while (index < length) {
-      int currentChar = encoding.codeUnitAt(index);
-      if (currentChar == _separatorChar) {
-        if (index + 1 < length &&
-            encoding.codeUnitAt(index + 1) == _separatorChar) {
-          buffer.writeCharCode(_separatorChar);
-          index += 2;
-        } else {
-          components.add(buffer.toString());
-          buffer = StringBuffer();
-          index++;
-        }
-      } else {
-        buffer.writeCharCode(currentChar);
-        index++;
-      }
-    }
-    components.add(buffer.toString());
-    return components;
-  }
-
-  /// Append an encoded form of the given [component] to the given [buffer].
-  void _encode(StringBuffer buffer, String component) {
-    int length = component.length;
-    for (int i = 0; i < length; i++) {
-      int currentChar = component.codeUnitAt(i);
-      if (currentChar == _separatorChar) {
-        buffer.writeCharCode(_separatorChar);
-      }
-      buffer.writeCharCode(currentChar);
-    }
-  }
-}
-
 /// A shared internal interface of `Element` and [Member].
 /// Used during migration to avoid referencing `Element`.
 abstract class ElementOrMember {

pkg/analyzer/test/src/dart/element/element_test.dart

@@ -5,7 +5,6 @@
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:test/test.dart';
@@ -18,7 +17,6 @@ import '../resolution/context_collection_resolution.dart';
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(ElementAnnotationImplTest);
-    defineReflectiveTests(ElementLocationImplTest);
     defineReflectiveTests(FieldElementImplTest);
     defineReflectiveTests(FunctionTypeImplTest);
     defineReflectiveTests(MaybeAugmentedInstanceElementMixinTest);
@@ -52,70 +50,6 @@ main() {
   }
 }
 
-@reflectiveTest
-class ElementLocationImplTest {
-  void test_create_encoding() {
-    String encoding = "a;b;c";
-    ElementLocationImpl location = ElementLocationImpl.con2(encoding);
-    expect(location.encoding, encoding);
-  }
-
-  /// For example unnamed constructor.
-  void test_create_encoding_emptyLast() {
-    String encoding = "a;b;c;";
-    ElementLocationImpl location = ElementLocationImpl.con2(encoding);
-    expect(location.encoding, encoding);
-  }
-
-  void test_equals_equal() {
-    String encoding = "a;b;c";
-    ElementLocationImpl first = ElementLocationImpl.con2(encoding);
-    ElementLocationImpl second = ElementLocationImpl.con2(encoding);
-    expect(first == second, isTrue);
-  }
-
-  void test_equals_notEqual_differentLengths() {
-    ElementLocationImpl first = ElementLocationImpl.con2("a;b;c");
-    ElementLocationImpl second = ElementLocationImpl.con2("a;b;c;d");
-    expect(first == second, isFalse);
-  }
-
-  void test_equals_notEqual_notLocation() {
-    ElementLocationImpl first = ElementLocationImpl.con2("a;b;c");
-    // ignore: unrelated_type_equality_checks
-    expect(first == "a;b;d", isFalse);
-  }
-
-  void test_equals_notEqual_sameLengths() {
-    ElementLocationImpl first = ElementLocationImpl.con2("a;b;c");
-    ElementLocationImpl second = ElementLocationImpl.con2("a;b;d");
-    expect(first == second, isFalse);
-  }
-
-  void test_getComponents() {
-    String encoding = "a;b;c";
-    ElementLocationImpl location = ElementLocationImpl.con2(encoding);
-    List<String> components = location.components;
-    expect(components, hasLength(3));
-    expect(components[0], "a");
-    expect(components[1], "b");
-    expect(components[2], "c");
-  }
-
-  void test_getEncoding() {
-    String encoding = "a;b;c;;d";
-    ElementLocationImpl location = ElementLocationImpl.con2(encoding);
-    expect(location.encoding, encoding);
-  }
-
-  void test_hashCode_equal() {
-    String encoding = "a;b;c";
-    ElementLocationImpl first = ElementLocationImpl.con2(encoding);
-    ElementLocationImpl second = ElementLocationImpl.con2(encoding);
-    expect(first.hashCode == second.hashCode, isTrue);
-  }
-}
-
 @reflectiveTest
 class FieldElementImplTest extends PubPackageResolutionTest {
   test_isEnumConstant() async {