Commit 50f96d6

pqCommit Queue

authored and

Commit Queue

committed

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 <brianwilkerson@google.com> > Commit-Queue: Phil Quitslund <pquitslund@google.com> Bug: #59869 Change-Id: I70063e64bd5c5792c57e8194416a4a0d2e6df8ed Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/408400 Reviewed-by: Siva Annamalai <asiva@google.com> Commit-Queue: Phil Quitslund <pquitslund@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

1 parent 7559108 commit 50f96d6Copy full SHA for 50f96d6

File tree

2 files changed

-24

lines changed

pkg/analyzer
- lib/src/lint
  - options_rule_validator.dart
- test/src/options
  - options_rule_validator_test.dart

2 files changed

-24

lines changed

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

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,17 +40,9 @@ class LinterRuleOptionsValidator extends OptionsValidator {`
`40`	`40`	`bool isDeprecatedInCurrentSdk(DeprecatedState state) =>`
`41`	`41`	`currentSdkAllows(state.since);`
`42`	`42`
`43`		`- bool isRemovedInCurrentOrEarlierSdk(State state) {`
	`43`	`+ bool isRemovedInCurrentSdk(State state) {`
`44`	`44`	`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);`
`54`	`46`	`}`
`55`	`47`
`56`	`48`	`@override`
`@@ -124,7 +116,7 @@ class LinterRuleOptionsValidator extends OptionsValidator {`
`124`	`116`	`arguments: [value],`
`125`	`117`	`);`
`126`	`118`	`}`
`127`		`- } else if (isRemovedInCurrentOrEarlierSdk(state)) {`
	`119`	`+ } else if (isRemovedInCurrentSdk(state)) {`
`128`	`120`	`var since = state.since.toString();`
`129`	`121`	`var replacedBy = (state as RemovedState).replacedBy;`
`130`	`122`	`if (replacedBy != null) {`

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

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,19 +200,6 @@ linter:`
`200`	`200`	`);`
`201`	`201`	`}`
`202`	`202`
`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`		`-`
`216`	`203`	`test_replaced_rule() {`
`217`	`204`	`assertErrors(`
`218`	`205`	`'''`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 50f96d6

File tree

2 files changed

2 files changed

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

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

0 commit comments