Skip to content

fix sort_directives violations #80817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fluttergithubbot merged 18 commits into from
Apr 21, 2021
Merged

fix sort_directives violations #80817

fluttergithubbot merged 18 commits into from
Apr 21, 2021

Conversation

@pq
Copy link
Contributor

@pq pq commented Apr 20, 2021 •
edited
Loading

The upcoming linter release includes a fix to sort_directives that will trigger a host of new violations. This fixes them up.

See: https://dart-review.googlesource.com/c/sdk/+/196026

Relevant failures: https://logs.chromium.org/logs/dart/buildbucket/cr-buildbucket.appspot.com/8849409225986491904/+/steps/analyze_flutter_flutter/0/stdout

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@google-cla google-cla bot added the cla: yes label Apr 20, 2021
@flutter-dashboard flutter-dashboard bot added a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: tests "flutter test", flutter_test, or one of our tests f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Apr 20, 2021
@pq pq requested review from goderbauer and jonahwilliams April 20, 2021 20:18
@skia-gold
Copy link

skia-gold commented Apr 20, 2021

Gold has detected about 1 untriaged digest(s) on patchset 1.
View them at https://flutter-gold.skia.org/cl/github/80817

@jonahwilliams
Copy link
Contributor

jonahwilliams commented Apr 20, 2021

Looks like there were several places where the imports were sorted about the language version comment:

https://github.com/flutter/flutter/pull/80817/files#diff-3c009329e72228284de00a4e71d17f55ccd60a2b47113451df6feb3a54c90728R4-R8

@pq
Copy link
Contributor Author

pq commented Apr 20, 2021

Ah. Not good. Thanks for the catch @jonahwilliams. I'll tidy up. Thanks!

@pq
Copy link
Contributor Author

pq commented Apr 20, 2021

Sorry for the haste. I should have run flutter analyze locally. Should be clean now. 👍

@skia-gold
Copy link

skia-gold commented Apr 20, 2021

Gold has detected about 1 untriaged digest(s) on patchset 4.
View them at https://flutter-gold.skia.org/cl/github/80817

goderbauer
goderbauer reviewed Apr 20, 2021
View reviewed changes
Copy link
Member

@goderbauer goderbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The golden file change is ... unexpected. Maybe it needs to be rebased to latest master?

goderbauer
goderbauer approved these changes Apr 20, 2021
View reviewed changes
Copy link
Member

@goderbauer goderbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fluttergithubbot
Copy link
Contributor

fluttergithubbot commented Apr 21, 2021

This pull request is not suitable for automatic merging in its current state.

  • The status or check suite Mac framework_tests_libraries has failed. Please fix the issues identified (or deflake) before re-applying this label.
  • The status or check suite Windows framework_tests_misc has failed. Please fix the issues identified (or deflake) before re-applying this label.

@fluttergithubbot
Copy link
Contributor

fluttergithubbot commented Apr 21, 2021

This pull request is not suitable for automatic merging in its current state.

  • The status or check suite Mac framework_tests_widgets has failed. Please fix the issues identified (or deflake) before re-applying this label.

@pq
Merge branch 'master' into sort_directives
00dac20 
# Conflicts:
#	packages/flutter_tools/test/general.shard/bundle_shim_test.dart
@fluttergithubbot fluttergithubbot merged commit 61c30c4 into flutter:master Apr 21, 2021
@pq pq mentioned this pull request Apr 21, 2021
Merged
8 tasks
dart-bot pushed a commit to dart-lang/sdk that referenced this pull request Apr 22, 2021
@pq
linter 1.4.0
17644ee 
Mitigating PRs:

https://dart-review.googlesource.com/c/sdk/+/196223
https://dart-review.googlesource.com/c/sdk/+/196180

flutter/flutter#80817
flutter/flutter#80901





Change-Id: Ib916d541076e24b9e8db1d6120dbc043d9e40b87
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196026
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
dart-bot pushed a commit to dart-lang/sdk that referenced this pull request Apr 23, 2021
@mkustermann
Revert "linter 1.4.0"
b3c0b58 
This reverts commit 17644ee.

Reason for revert: This caused various failures in HHH configuration
which is an early warning that dart-lang/sdk -> flutter/{engine,flutter}
rolls will not work smoothly.

See more information in go/dartvm-gardening-log for various failures
this causes.

Original change's description:
> linter 1.4.0
>
> Mitigating PRs:
>
> https://dart-review.googlesource.com/c/sdk/+/196223
> https://dart-review.googlesource.com/c/sdk/+/196180
>
> flutter/flutter#80817
> flutter/flutter#80901
>
>
>
>
>
> Change-Id: Ib916d541076e24b9e8db1d6120dbc043d9e40b87
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196026
> Commit-Queue: Phil Quitslund <[email protected]>
> Reviewed-by: Brian Wilkerson <[email protected]>

[email protected],[email protected],[email protected]

Change-Id: I15af9de53d98de7b65902a015bef7ac2d368abeb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196499
Reviewed-by: Martin Kustermann <[email protected]>
Commit-Queue: Martin Kustermann <[email protected]>
@pq pq mentioned this pull request Nov 19, 2024
Closed
9 tasks
dart-bot pushed a commit to dart-lang/sdk that referenced this pull request Apr 27, 2021
@pq
Reland "linter 1.4.0"
513c1a1 
This is a reland of 17644ee

Additional supporting changes in flutter (and plugins):

flutter/flutter#81017
flutter/plugins#3823
flutter/flutter#80817
flutter/flutter#80901
flutter/flutter#81210

Additional context in meta linter issue: https://github.com/dart-lang/linter/issues/2609





Original change's description:
> linter 1.4.0
>
> Mitigating PRs:
>
> https://dart-review.googlesource.com/c/sdk/+/196223
> https://dart-review.googlesource.com/c/sdk/+/196180
>
> flutter/flutter#80817
> flutter/flutter#80901
>
>
>
>
>
> Change-Id: Ib916d541076e24b9e8db1d6120dbc043d9e40b87
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196026
> Commit-Queue: Phil Quitslund <[email protected]>
> Reviewed-by: Brian Wilkerson <[email protected]>

Change-Id: Ie6b9682a2f54ef039dd7ac9c6a46cb925615acef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196581
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@goderbauer goderbauer goderbauer approved these changes

@jonahwilliams jonahwilliams Awaiting requested review from jonahwilliams

Assignees

No one assigned

Labels

a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: tests "flutter test", flutter_test, or one of our tests c: contributor-productivity Team-specific productivity, code health, technical debt. f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@pq @skia-gold @jonahwilliams @fluttergithubbot @goderbauer