Skip to content
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

fix unsorted directives #80901

Merged
merged 1 commit into from
Apr 22, 2021
Merged

fix unsorted directives #80901

merged 1 commit into from
Apr 22, 2021

Conversation

pq
Copy link
Contributor

@pq pq commented Apr 21, 2021 •
edited
Loading

The upcoming linter release includes a fix to sort_directives that will trigger a host of new violations. This fixes issues that cropped up since #80817

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

Failures: https://logs.chromium.org/logs/dart/buildbucket/cr-buildbucket.appspot.com/8849308566291597920/+/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.

@pq pq requested a review from Piinks as a code owner April 21, 2021 21:52
@flutter-dashboard flutter-dashboard bot added a: internationalization Supporting other languages or locales. (aka i18n) 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. tool Affects the "flutter" command-line tool. See also t: labels. labels Apr 21, 2021
@google-cla google-cla bot added the cla: yes label Apr 21, 2021
@pq pq requested a review from goderbauer April 21, 2021 21:53
@pq pq changed the title sort directives fix unsorted directives Apr 21, 2021
goderbauer
goderbauer approved these changes Apr 21, 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 fluttergithubbot merged commit 9c0270d into flutter:master Apr 22, 2021
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 <pquitslund@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
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 <pquitslund@google.com>
> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

TBR=brianwilkerson@google.com,pquitslund@google.com,davidmorgan@google.com

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 <kustermann@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
This was referenced Apr 23, 2021
Merged
Closed
Merged
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: dart-lang/linter#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 <pquitslund@google.com>
> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Change-Id: Ie6b9682a2f54ef039dd7ac9c6a46cb925615acef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/196581
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
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

@Piinks Piinks Awaiting requested review from Piinks

Assignees
No one assigned
Labels
a: internationalization Supporting other languages or locales. (aka i18n) 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. 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.

None yet
3 participants
@pq @goderbauer @fluttergithubbot