Skip to content

Commit f5fedc4

Browse files
stereotype441Commit Queue
authored andcommitted
[analyzer] Remove deprecated class BaseDeprecatedMemberUseVerifier.
This class was left in https://dart-review.googlesource.com/c/sdk/+/450263 as a temporary measure since it was used in internal Google sources. Now that those internal sources have been migrated to use `MemberUseVerifier` instead, it is no longer needed. Removing it also allows the class `_TransitionalMemberUseReporter` to be removed, as well as the `element` parameter of `MemberUseReporter.report`. Change-Id: I6a6a69644965549c879e4d25f75e0db7c97af090 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/450362 Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Paul Berry <[email protected]>
1 parent 0aacd0c commit f5fedc4

File tree

3 files changed

+1
-85
lines changed

3 files changed

+1
-85
lines changed

pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'package:analyzer/dart/ast/syntactic_entity.dart';
66
import 'package:analyzer/dart/element/element.dart';
77
import 'package:analyzer/error/listener.dart';
8-
import 'package:analyzer/src/dart/ast/ast.dart';
98
import 'package:analyzer/src/dart/error/hint_codes.dart';
109
import 'package:analyzer/src/error/element_usage_detector.dart';
1110

@@ -29,59 +28,6 @@ String? normalizeDeprecationMessage(String message) {
2928
}
3029
}
3130

32-
/// Legacy class used in a custom google3 lint for detecting certain deprecated
33-
/// elements.
34-
///
35-
// TODO(paulberry): rewrite the google3 lint using `ElementUsageDetector` and
36-
// then remove this class.
37-
@Deprecated('Use ElementUsageDetector instead')
38-
abstract class BaseDeprecatedMemberUseVerifier {
39-
late final ElementUsageDetector<String> _elementUsageDetector =
40-
ElementUsageDetector(
41-
workspacePackage: null,
42-
elementUsageSet: const DeprecatedElementUsageSet(),
43-
elementUsageReporter:
44-
_TransitionalElementUseReporter._TransitionalElementUsageReporter(
45-
this,
46-
),
47-
);
48-
49-
void constructorName(ConstructorName node) {
50-
_elementUsageDetector.constructorName(node);
51-
}
52-
53-
void functionExpressionInvocation(FunctionExpressionInvocation node) {
54-
_elementUsageDetector.functionExpressionInvocation(node);
55-
}
56-
57-
void instanceCreationExpression(InstanceCreationExpression node) {
58-
_elementUsageDetector.instanceCreationExpression(node);
59-
}
60-
61-
void methodInvocation(MethodInvocation node) {
62-
_elementUsageDetector.methodInvocation(node);
63-
}
64-
65-
void namedType(NamedType node) {
66-
_elementUsageDetector.namedType(node);
67-
}
68-
69-
void redirectingConstructorInvocation(RedirectingConstructorInvocation node) {
70-
_elementUsageDetector.redirectingConstructorInvocation(node);
71-
}
72-
73-
void reportError(
74-
SyntacticEntity errorEntity,
75-
Element element,
76-
String displayName,
77-
String? message,
78-
);
79-
80-
void simpleIdentifier(SimpleIdentifier node) {
81-
_elementUsageDetector.simpleIdentifier(node);
82-
}
83-
}
84-
8531
/// Instance of [ElementUsageReporter] for reporting uses of deprecated
8632
/// elements.
8733
class DeprecatedElementUsageReporter implements ElementUsageReporter<String> {
@@ -97,7 +43,6 @@ class DeprecatedElementUsageReporter implements ElementUsageReporter<String> {
9743
String displayName,
9844
String tagInfo, {
9945
required bool isInSamePackage,
100-
required Element element,
10146
}) {
10247
if (normalizeDeprecationMessage(tagInfo) case var message?) {
10348
_diagnosticReporter.atEntity(
@@ -151,27 +96,3 @@ class DeprecatedElementUsageSet implements ElementUsageSet<String> {
15196
return null;
15297
}
15398
}
154-
155-
/// Auxiliary class used by [BaseDeprecatedMemberUseVerifier].
156-
///
157-
// TODO(paulberry): remove this class when removing
158-
// `BaseDeprecatedMemberUseVerifier`.
159-
@Deprecated('Will be removed along with BaseDeprecatedMemberUseVerifier')
160-
class _TransitionalElementUseReporter implements ElementUsageReporter<String> {
161-
final BaseDeprecatedMemberUseVerifier _verifier;
162-
163-
_TransitionalElementUseReporter._TransitionalElementUsageReporter(
164-
this._verifier,
165-
);
166-
167-
@override
168-
void report(
169-
SyntacticEntity usageSite,
170-
String displayName,
171-
String? tagInfo, {
172-
required bool isInSamePackage,
173-
required Element element,
174-
}) {
175-
_verifier.reportError(usageSite, element, displayName, tagInfo);
176-
}
177-
}

pkg/analyzer/lib/src/error/element_usage_detector.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class ElementUsageDetector<TagInfo extends Object> {
118118
displayName,
119119
tagInfo,
120120
isInSamePackage: _isLibraryInWorkspacePackage(element.library),
121-
element: element,
122121
);
123122
}
124123

@@ -322,15 +321,12 @@ abstract class ElementUsageReporter<TagInfo extends Object> {
322321
/// [displayName] is the name of the element that was used. [tagInfo] is the
323322
/// tag information returned by [ElementUsageSet.getTagInfo].
324323
/// [isInSamePackage] indicates whether the element and its usage are in
325-
/// the same package. [element] is the element whose usage was detected.
324+
/// the same package.
326325
void report(
327326
SyntacticEntity usageSite,
328327
String displayName,
329328
TagInfo tagInfo, {
330329
required bool isInSamePackage,
331-
// Note: `element` exists as a temporary measure for g3 migration.
332-
// TODO(paulberry): remove this parameter when it's no longer needed.
333-
required Element element,
334330
});
335331
}
336332

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ class _DeprecatedElementUsageReporter extends ElementUsageReporter<String> {
6363
String displayName,
6464
String tagInfo, {
6565
required bool isInSamePackage,
66-
required Element element,
6766
}) {
6867
if (!isInSamePackage) {
6968
// In this case, `DEPRECATED_MEMBER_USE` is reported by the analyzer.

0 commit comments

Comments
 (0)