Skip to content

Re-generate from latest beta branch - #30

Merged
devoncarew merged 5 commits into
flutter:masterfrom
DanTup:updates
Mar 7, 2022
Merged

devoncarew merged 5 commits into
flutter:masterfrom
DanTup:updates

Conversation

@DanTup

@DanTup DanTup commented Feb 28, 2022

Copy link
Copy Markdown
Contributor

This is the result of running flutter pub run grinder generate against the current Flutter beta branch.

I committed in three commits to make it easier to review:

  • Any changes to existing image files (I don't know why these changed, but those I've spot-checked are subtle)
  • Any new image files (of which there are many)
  • Any non-image files (the metadata, and a fix to the readme)

@devoncarew are you a good person to review/merge this?

@devoncarew

Copy link
Copy Markdown
Contributor

@devoncarew are you a good person to review/merge this?

Sure - looking now.

devoncarew
devoncarew previously approved these changes Feb 28, 2022

@devoncarew devoncarew left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

That is a lot of new files!

I wonder if we should have a CI which runs ~weekly, and fails if the frameworkVersion is older that the current stable? We're reving from 2.2.0 ==> 2.11.0-0.1.pre.

@DanTup

DanTup commented Feb 28, 2022

Copy link
Copy Markdown
Contributor Author

That is a lot of new files!

Yup. The more this grows, the more I feel like shipping them all inside the extension isn't the right call. I think IntelliJ is extracting them from the icon now, but that doesn't work very well for VS Code. It'd be god to get this in the server (similar to colours), but it would require Flutter having (or generating) them on-disk in the package (which I suspect is also not ideal).

I wonder if we should have a CI which runs ~weekly, and fails if the frameworkVersion is older that the current stable? We're reving from 2.2.0 ==> 2.11.0-0.1.pre.

Yeah, that would catch some issues like Dart-Code/Dart-Code#3843 (although, that one has added complexity that the rewriting of doc comments don't have the same names as the files on disk). I can have a look at setting that up on GH Actions (if that's suitable) assuming the repo allows.

@DanTup

DanTup commented Feb 28, 2022

Copy link
Copy Markdown
Contributor Author

Apparently the PR check bot is running the entire script too... Perhaps if it's set up to run weekly it could just open a PR 😄

@devoncarew

Copy link
Copy Markdown
Contributor

Hmm, it looks like the script is failing w/ an NPE here: https://github.com/flutter/tools_metadata/blob/master/tool/catalog/generate_widget_catalog.dart#L144, when trying to validate the generation?

@DanTup

DanTup commented Mar 4, 2022

Copy link
Copy Markdown
Contributor Author

Odd, it completed when I ran it locally - I'll take a look soon. This isn't blocking for VS Code (I don't use this repo directly, I copy the folder, so I just copied it from this branch in the last release), but I presume IntelliJ will also want to update to get the new icons.

@DanTup

DanTup commented Mar 6, 2022

Copy link
Copy Markdown
Contributor Author

I think maybe I only did the icons when I ran locally, so didn't hit the NPE. I've opened #31 with a fix for that (+ package upgrades and null-safe changes) and will rebase this and add another commit with the non-icon changes I missed after that's done.

@DanTup

DanTup commented Mar 7, 2022

Copy link
Copy Markdown
Contributor Author

@devoncarew this PR is now green, but it includes some additional changes (upgrading deps to get latest analyzer package, which also means null-safe changes).

To make it easier to review, I opened a PR with everything except the image file changes. We should just merge this PR once you're happy with it all though and close that one.

The changes include:

  • Upgrading deps + fixing null-safety issues
  • Fixing an NPE trying to process mixins that extended Widget
  • Re-generate all files from current Flutter beta branch
  • Minor tweaks to bot scripts
    • fetch deps for nested package in script before analyzing the root
    • removing exclusion of nested package from analyzing root (to avoid missing analysis errors if only having the root project open in editor)
    • clearer printing of error reasons when script fails

I reviewed some of the image changes more closely, and it looks like there were some alignment issues in the previous generation, as running now seems to align the icons better within the box, for example:

Screenshot 2022-03-07 at 11 37 34

I'm not sure why they were misaligned before, but they at least some correct now.

@devoncarew devoncarew left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@devoncarew
devoncarew merged commit f9c1d66 into flutter:master Mar 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants