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.

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

fix: Consistently add trailing comma on typed parameters #4164

Merged
merged 7 commits into from
Jan 27, 2024

Conversation

cobaltt7
Copy link
Contributor

@cobaltt7 cobaltt7 commented Jan 23, 2024

Description

Resolves #4080

Checklist - did you ...

  • [y] Add an entry in CHANGES.md if necessary?
  • [y] Add / update tests if necessary?
  • [y] Add new / update outdated documentation?

Copy link

github-actions bot commented Jan 24, 2024

diff-shades results comparing this PR (0871f82) to main (ed770ba). The full diff is available in the logs under the "Generate HTML diff report" step.

╭─────────────────────── Summary ────────────────────────╮
│ 10 projects & 32 files changed / 98 changes [+49/-49]  │
│                                                        │
│ ... out of 2 530 265 lines, 12 157 files & 22 projects │
╰────────────────────────────────────────────────────────╯

Differences found.

What is this? | Workflow run | diff-shades documentation

Signed-off-by: RedGuy12 <[email protected]>
leaf.type == token.COMMA
and (
Preview.typed_params_trailing_comma not in original.mode
or not is_part_of_annotation(leaf)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we use is_part_of_annotation to simplify some of the logic in the next check too? Lines 1092-1099?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried, but it ended up adding a lot of unrelated changes to this PR since is_part_of_annotation currently checks for both return and parameter annotations. I can do that refactor in a future PR.

Copy link
Collaborator

@hauntsaninja hauntsaninja left a comment

Choose a reason for hiding this comment

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

Thank you for all you recent PRs!

@cobaltt7
Copy link
Contributor Author

No idea why diff-shades is detecting changes in stable style now, I only merged upstream in and didn't change any logic. Additionally, it's only finding changes when linting Black itself, past diff-shades runs showed changes in other projects on preview style (compare stable run today and preview run Wednesday)

@JelleZijlstra
Copy link
Collaborator

I suspect it's because Black itself is now formatted with unstable = true and diff-shades maybe doesn't handle that correctly.

@hauntsaninja
Copy link
Collaborator

ichard26/diff-shades#15 as a quick patch

Copy link
Collaborator

@JelleZijlstra JelleZijlstra left a comment

Choose a reason for hiding this comment

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

Looks good. I'll fix the one minor issue, then hopefully diff-shades will succeed if I retry.

CHANGES.md Outdated Show resolved Hide resolved
@JelleZijlstra
Copy link
Collaborator

Maybe ichard26/diff-shades#16 helps, trying again.

@JelleZijlstra
Copy link
Collaborator

diff-shades succeeded (not sure it's because of my changes, as it was apparently already using 4 processes). Quite a few changes, but they all look expected.

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.

Single-argument function includes trailing comma inconsistently
3 participants