Elements. Remove V1 Element used in scopes.
Change-Id: Ic4f838e9033942137b1d4a855d9d378bb2a1931f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423073
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index 0bc25ba..d3e0eed 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt
@@ -3896,9 +3896,7 @@
lookup (method: ScopeLookupResult Function(String))
ScopeLookupResult (class extends Object):
new (constructor: ScopeLookupResult Function())
- getter (getter: Element?, deprecated)
getter2 (getter: Element2?)
- setter (getter: Element?, deprecated)
setter2 (getter: Element2?)
package:analyzer/dart/element/type.dart:
DartType (class extends Object):
@@ -4333,7 +4331,6 @@
lockLevel= (setter: int)
source (getter: Source)
atConstructorDeclaration (method: void Function(ConstructorDeclaration, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
- atElement (method: void Function(Element, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}), deprecated)
atElement2 (method: void Function(Element2, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}), experimental)
atEntity (method: void Function(SyntacticEntity, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
atNode (method: void Function(AstNode, ErrorCode, {List<Object>? arguments, List<DiagnosticMessage>? contextMessages, Object? data}))
@@ -4695,11 +4692,8 @@
EMPTY (static getter: Namespace)
EMPTY= (static setter: Namespace)
new (constructor: Namespace Function(Map<String, Element2>))
- definedNames (getter: Map<String, Element>, deprecated)
definedNames2 (getter: Map<String, Element2>)
- get (method: Element? Function(String), deprecated)
get2 (method: Element2? Function(String))
- getPrefixed (method: Element? Function(String, String), deprecated)
getPrefixed2 (method: Element2? Function(String, String))
package:analyzer/src/generated/engine.dart:
AnalysisContext@2 (class extends Object):
diff --git a/pkg/analyzer/lib/dart/element/scope.dart b/pkg/analyzer/lib/dart/element/scope.dart
index 6ad4f71..373745c 100644
--- a/pkg/analyzer/lib/dart/element/scope.dart
+++ b/pkg/analyzer/lib/dart/element/scope.dart
@@ -2,9 +2,7 @@
// 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/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
/// Scopes are used to resolve names to elements.
///
@@ -22,13 +20,7 @@
///
/// Clients may not extend, implement or mix-in this class.
abstract class ScopeLookupResult {
- @Deprecated('Use getter2 instead')
- Element? get getter => getter2?.asElement;
-
Element2? get getter2;
- @Deprecated('Use setter2 instead')
- Element? get setter => setter2?.asElement;
-
Element2? get setter2;
}
diff --git a/pkg/analyzer/lib/error/listener.dart b/pkg/analyzer/lib/error/listener.dart
index af8d318..dfa79a5 100644
--- a/pkg/analyzer/lib/error/listener.dart
+++ b/pkg/analyzer/lib/error/listener.dart
@@ -6,7 +6,6 @@
show AstNode, ConstructorDeclaration;
import 'package:analyzer/dart/ast/syntactic_entity.dart';
import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
@@ -99,27 +98,6 @@
/// Report an error with the given [errorCode] and [arguments].
/// The [element] is used to compute the location of the error.
- @Deprecated('Use atElement2() instead')
- void atElement(
- Element element,
- ErrorCode errorCode, {
- List<Object>? arguments,
- List<DiagnosticMessage>? contextMessages,
- Object? data,
- }) {
- var nonSynthetic = element.nonSynthetic;
- atOffset(
- errorCode: errorCode,
- offset: nonSynthetic.nameOffset,
- length: nonSynthetic.nameLength,
- arguments: arguments,
- contextMessages: contextMessages,
- data: data,
- );
- }
-
- /// Report an error with the given [errorCode] and [arguments].
- /// The [element] is used to compute the location of the error.
@experimental
void atElement2(
Element2 element2,
diff --git a/pkg/analyzer/lib/src/dart/resolver/scope.dart b/pkg/analyzer/lib/src/dart/resolver/scope.dart
index 3fb2dbd..e8c61eb 100644
--- a/pkg/analyzer/lib/src/dart/resolver/scope.dart
+++ b/pkg/analyzer/lib/src/dart/resolver/scope.dart
@@ -4,13 +4,10 @@
import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
-import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/src/dart/ast/ast.dart';
import 'package:analyzer/src/dart/element/element.dart';
import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/utilities/extensions/collection.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
/// The scope defined by a block.
class BlockScope {
@@ -125,32 +122,15 @@
/// Return a table containing the same mappings as those defined by this
/// namespace.
- @Deprecated('Use definedNames2 instead')
- Map<String, Element> get definedNames =>
- _definedNames.mapValue((e) => e.asElement!);
-
- /// Return a table containing the same mappings as those defined by this
- /// namespace.
Map<String, Element2> get definedNames2 => _definedNames;
/// Return the element in this namespace that is available to the containing
/// scope using the given name, or `null` if there is no such element.
- @Deprecated('Use get2() instead')
- Element? get(String name) => _definedNames[name]?.asElement;
-
- /// Return the element in this namespace that is available to the containing
- /// scope using the given name, or `null` if there is no such element.
Element2? get2(String name) => _definedNames[name];
/// Return the element in this namespace whose name is the result of combining
/// the [prefix] and the [name], separated by a period, or `null` if there is
/// no such element.
- @Deprecated('Use getPrefixed2() instead')
- Element? getPrefixed(String prefix, String name) => null;
-
- /// Return the element in this namespace whose name is the result of combining
- /// the [prefix] and the [name], separated by a period, or `null` if there is
- /// no such element.
Element2? getPrefixed2(String prefix, String name) => null;
}
@@ -323,27 +303,11 @@
: _prefix = prefix,
_length = prefix.length;
- @Deprecated('Use definedNames2 instead')
- @override
- Map<String, Element> get definedNames {
- var definedNames = <String, Element>{};
- _definedNames.forEach((name, element) {
- definedNames["$_prefix.$name"] = element.asElement!;
- });
- return definedNames;
- }
-
@override
Map<String, Element2> get definedNames2 {
return _definedNames;
}
- @Deprecated('Use get2() instead')
- @override
- Element? get(String name) {
- return get2(name)?.asElement;
- }
-
@override
Element2? get2(String name) {
if (name.length > _length && name.startsWith(_prefix)) {
@@ -354,12 +318,6 @@
return null;
}
- @Deprecated('Use getPrefixed2() instead')
- @override
- Element? getPrefixed(String prefix, String name) {
- return getPrefixed2(prefix, name)?.asElement;
- }
-
@override
Element2? getPrefixed2(String prefix, String name) {
if (prefix == _prefix) {
