Skip to content

Commit 126c8d9

Browse files
pqCommit Queue
pq
authored and
Commit Queue
committed
[element model] migrate deprecated_member_use_from_same_package
Bug: https://github.com/dart-lang/linter/issues/5099 Change-Id: Iba83df6d4a100e609cfa8c49ec88c614d0e64436 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393603 Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]>
1 parent 16baa33 commit 126c8d9

File tree

3 files changed

+42
-38
lines changed

3 files changed

+42
-38
lines changed

‎pkg/analyzer/lib/src/dart/ast/ast.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ final class AssignmentExpressionImpl extends ExpressionImpl
892892

893893
@experimental
894894
@override
895-
MethodElement2? get element => (staticElement as MethodFragment?)?.element;
895+
MethodElement2? get element => staticElement?.asElement2;
896896

897897
@override
898898
Token get endToken => _rightHandSide.endToken;
@@ -14157,7 +14157,7 @@ final class PostfixExpressionImpl extends ExpressionImpl
1415714157

1415814158
@experimental
1415914159
@override
14160-
MethodElement2? get element => (staticElement as MethodFragment?)?.element;
14160+
MethodElement2? get element => staticElement?.asElement2;
1416114161

1416214162
@override
1416314163
Token get endToken => operator;
@@ -14368,7 +14368,7 @@ final class PrefixExpressionImpl extends ExpressionImpl
1436814368

1436914369
@experimental
1437014370
@override
14371-
MethodElement2? get element => (staticElement as MethodFragment?)?.element;
14371+
MethodElement2? get element => staticElement?.asElement2;
1437214372

1437314373
@override
1437414374
Token get endToken => _operand.endToken;

‎pkg/linter/analyzer_use_new_elements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
lib/src/extensions.dart
2-
lib/src/rules/deprecated_member_use_from_same_package.dart
32
lib/src/rules/invalid_runtime_check_with_js_interop_types.dart
43
lib/src/rules/prefer_initializing_formals.dart
54
lib/src/rules/unnecessary_overrides.dart

‎pkg/linter/lib/src/rules/deprecated_member_use_from_same_package.dart‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/syntactic_entity.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
8-
import 'package:analyzer/dart/element/element.dart';
8+
import 'package:analyzer/dart/element/element2.dart';
99
// ignore: implementation_imports
1010
import 'package:analyzer/src/error/deprecated_member_use_verifier.dart';
1111
// ignore: implementation_imports
@@ -45,10 +45,11 @@ class _DeprecatedMemberUseVerifier extends BaseDeprecatedMemberUseVerifier {
4545
_DeprecatedMemberUseVerifier(this._rule, this._workspacePackage);
4646

4747
@override
48-
void reportError(SyntacticEntity errorEntity, Element element,
48+
void reportError2(SyntacticEntity errorEntity, Element2 element,
4949
String displayName, String? message) {
50-
var library = element is LibraryElement ? element : element.library;
51-
if (library == null || !_workspacePackage.contains(library.source)) {
50+
var library = element is LibraryElement2 ? element : element.library2;
51+
if (library == null ||
52+
!_workspacePackage.contains(library.firstFragment.source)) {
5253
// In this case, `DEPRECATED_MEMBER_USE` is reported by the analyzer.
5354
return;
5455
}
@@ -106,8 +107,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
106107

107108
@override
108109
void visitClassDeclaration(ClassDeclaration node) {
109-
_deprecatedVerifier
110-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
110+
_deprecatedVerifier.pushInDeprecatedValue(
111+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
111112

112113
try {
113114
super.visitClassDeclaration(node);
@@ -118,8 +119,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
118119

119120
@override
120121
void visitClassTypeAlias(ClassTypeAlias node) {
121-
_deprecatedVerifier
122-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
122+
_deprecatedVerifier.pushInDeprecatedValue(
123+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
123124

124125
try {
125126
super.visitClassTypeAlias(node);
@@ -130,19 +131,19 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
130131

131132
@override
132133
void visitCompilationUnit(CompilationUnit node) {
133-
var library = node.declaredElement?.library;
134+
var library = node.declaredFragment?.element;
134135
if (library == null) {
135136
return;
136137
}
137-
_deprecatedVerifier.pushInDeprecatedValue(library.hasDeprecated);
138+
_deprecatedVerifier.pushInDeprecatedValue(library.metadata2.hasDeprecated);
138139

139140
super.visitCompilationUnit(node);
140141
}
141142

142143
@override
143144
void visitConstructorDeclaration(ConstructorDeclaration node) {
144-
_deprecatedVerifier
145-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
145+
_deprecatedVerifier.pushInDeprecatedValue(
146+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
146147

147148
try {
148149
super.visitConstructorDeclaration(node);
@@ -159,8 +160,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
159160

160161
@override
161162
void visitDefaultFormalParameter(DefaultFormalParameter node) {
162-
_deprecatedVerifier
163-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
163+
_deprecatedVerifier.pushInDeprecatedValue(
164+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
164165

165166
try {
166167
super.visitDefaultFormalParameter(node);
@@ -171,8 +172,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
171172

172173
@override
173174
void visitEnumDeclaration(EnumDeclaration node) {
174-
_deprecatedVerifier
175-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
175+
_deprecatedVerifier.pushInDeprecatedValue(
176+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
176177

177178
try {
178179
super.visitEnumDeclaration(node);
@@ -189,8 +190,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
189190

190191
@override
191192
void visitExtensionDeclaration(ExtensionDeclaration node) {
192-
_deprecatedVerifier
193-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
193+
_deprecatedVerifier.pushInDeprecatedValue(
194+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
194195

195196
try {
196197
super.visitExtensionDeclaration(node);
@@ -207,8 +208,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
207208

208209
@override
209210
void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
210-
_deprecatedVerifier
211-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
211+
_deprecatedVerifier.pushInDeprecatedValue(
212+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
212213

213214
try {
214215
super.visitExtensionTypeDeclaration(node);
@@ -230,8 +231,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
230231

231232
@override
232233
void visitFieldFormalParameter(FieldFormalParameter node) {
233-
_deprecatedVerifier
234-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
234+
_deprecatedVerifier.pushInDeprecatedValue(
235+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
235236

236237
try {
237238
super.visitFieldFormalParameter(node);
@@ -242,8 +243,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
242243

243244
@override
244245
void visitFunctionDeclaration(FunctionDeclaration node) {
245-
_deprecatedVerifier
246-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
246+
_deprecatedVerifier.pushInDeprecatedValue(
247+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
247248

248249
try {
249250
super.visitFunctionDeclaration(node);
@@ -260,8 +261,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
260261

261262
@override
262263
void visitFunctionTypeAlias(FunctionTypeAlias node) {
263-
_deprecatedVerifier
264-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
264+
_deprecatedVerifier.pushInDeprecatedValue(
265+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
265266

266267
try {
267268
super.visitFunctionTypeAlias(node);
@@ -272,8 +273,12 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
272273

273274
@override
274275
void visitGenericTypeAlias(GenericTypeAlias node) {
275-
_deprecatedVerifier
276-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
276+
var element = node.declaredFragment?.element;
277+
var hasDeprecated = (element is Annotatable)
278+
? (element! as Annotatable).metadata2.hasDeprecated
279+
: false;
280+
281+
_deprecatedVerifier.pushInDeprecatedValue(hasDeprecated);
277282

278283
try {
279284
super.visitGenericTypeAlias(node);
@@ -302,8 +307,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
302307

303308
@override
304309
void visitMethodDeclaration(MethodDeclaration node) {
305-
_deprecatedVerifier
306-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
310+
_deprecatedVerifier.pushInDeprecatedValue(
311+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
307312

308313
try {
309314
super.visitMethodDeclaration(node);
@@ -320,8 +325,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
320325

321326
@override
322327
void visitMixinDeclaration(MixinDeclaration node) {
323-
_deprecatedVerifier
324-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
328+
_deprecatedVerifier.pushInDeprecatedValue(
329+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
325330

326331
try {
327332
super.visitMixinDeclaration(node);
@@ -357,8 +362,8 @@ class _RecursiveVisitor extends RecursiveAstVisitor<void> {
357362

358363
@override
359364
void visitSimpleFormalParameter(SimpleFormalParameter node) {
360-
_deprecatedVerifier
361-
.pushInDeprecatedValue(node.declaredElement?.hasDeprecated ?? false);
365+
_deprecatedVerifier.pushInDeprecatedValue(
366+
node.declaredFragment?.element.metadata2.hasDeprecated ?? false);
362367

363368
try {
364369
super.visitSimpleFormalParameter(node);

0 commit comments

Comments
 (0)