Skip to content

Commit 50f96d6

Browse files
pqCommit Queue
authored andcommitted
Revert "[diagnostics] fix removed_lint reporting"
This reverts commit a9f288a. Reason for revert: Flutter roll blocking Original change's description: > [diagnostics] fix `removed_lint` reporting > > Bug: #59869 > Change-Id: I0b69f4380e0b556f6612294a3c6485cebd5e56fd > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407621 > Reviewed-by: Brian Wilkerson <[email protected]> > Commit-Queue: Phil Quitslund <[email protected]> Bug: #59869 Change-Id: I70063e64bd5c5792c57e8194416a4a0d2e6df8ed Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408400 Reviewed-by: Siva Annamalai <[email protected]> Commit-Queue: Phil Quitslund <[email protected]> Bot-Commit: Rubber Stamper <[email protected]>
1 parent 7559108 commit 50f96d6

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

pkg/analyzer/lib/src/lint/options_rule_validator.dart

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,9 @@ class LinterRuleOptionsValidator extends OptionsValidator {
4040
bool isDeprecatedInCurrentSdk(DeprecatedState state) =>
4141
currentSdkAllows(state.since);
4242

43-
bool isRemovedInCurrentOrEarlierSdk(State state) {
43+
bool isRemovedInCurrentSdk(State state) {
4444
if (state is! RemovedState) return false;
45-
46-
var removed = state.since;
47-
// No "since" applies to all SDKs.
48-
if (removed == null) return true;
49-
50-
return switch (sdkVersionConstraint) {
51-
VersionRange(min: var min?) => removed <= min,
52-
_ => false
53-
};
45+
return currentSdkAllows(state.since);
5446
}
5547

5648
@override
@@ -124,7 +116,7 @@ class LinterRuleOptionsValidator extends OptionsValidator {
124116
arguments: [value],
125117
);
126118
}
127-
} else if (isRemovedInCurrentOrEarlierSdk(state)) {
119+
} else if (isRemovedInCurrentSdk(state)) {
128120
var since = state.since.toString();
129121
var replacedBy = (state as RemovedState).replacedBy;
130122
if (replacedBy != null) {

pkg/analyzer/test/src/options/options_rule_validator_test.dart

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,6 @@ linter:
200200
);
201201
}
202202

203-
/// https://github.com/dart-lang/sdk/issues/59869
204-
test_removed_rule_previousSdk() {
205-
assertErrors(
206-
'''
207-
linter:
208-
rules:
209-
- removed_in_2_12_lint
210-
''',
211-
[AnalysisOptionsWarningCode.REMOVED_LINT],
212-
sdk: dart3_3,
213-
);
214-
}
215-
216203
test_replaced_rule() {
217204
assertErrors(
218205
'''

0 commit comments

Comments
 (0)