fix_fmt_skip_in_one_liners #4800

sonianuj287 · 2025-10-18T17:31:27Z

Closes #4783

Description

Checklist - did you ...

Implement any code style changes under the --preview style, following the
stability policy?
Add an entry in CHANGES.md if necessary?
Add / update tests if necessary?
Add new / update outdated documentation?

sonianuj287 · 2025-10-18T18:33:57Z

Hi @cobaltt7 , please review this PR and suggest me changes. Thanks :)

cobaltt7 · 2025-10-19T00:38:41Z

Please update tests and the changelog

for more information, see https://pre-commit.ci

Add type assertion for simple_stmt nodes to ensure mypy compliance. The simple_stmt is always a Node, so this assertion is safe.

github-actions · 2025-10-19T13:35:25Z

diff-shades reports zero changes comparing this PR (a08e439) to main (4865e32).

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

cobaltt7

Although this doesn't change the stable style and doesn't need to be in the preview style, I think I'd prefer to have it there for consistency anyway. That could be done just by returning early inside _find_compound_statement_context if Preview.fix_fmt_skip_in_one_liners in mode. The preview feature already exists, so you shouldn't need to do anything else with that.

The similar issues #4782 and #4781 currently cause crashes with fix_fmt_skip_in_one_liners - would it be difficult to fix those in this PR too? It looks like it's a similar issue, but I'm unfamiliar with this part of the codebase.

src/black/comments.py

CHANGES.md

for more information, see https://pre-commit.ci

sonianuj287 · 2025-10-21T17:28:19Z

Hi @cobaltt7 , so sorry to spam your inbox. Just want to work here more, please help me with reviewing and suggesting changes. Thanks :)

sonianuj287 · 2025-10-23T18:50:44Z

Hi @cobaltt7 @Jonty @amyreese @blueyed , please review this PR and suggest me changes.
Thanks :)

cobaltt7 · 2025-10-24T14:59:14Z

Soery for the delay! I'll have time to take a look this weekend.

sonianuj287 · 2025-10-26T11:10:54Z

Soery for the delay! I'll have time to take a look this weekend.

Hi @cobaltt7 , sorry for pinging you on weekend. But did you get a chance to look in the PR.

Signed-off-by: cobalt <[email protected]>

sonianuj287 · 2025-10-26T16:01:46Z

Soery for the delay! I'll have time to take a look this weekend.

Hi @cobaltt7 , sorry for pinging you on weekend. But did you get a chance to look in the PR.

Thanks for the changes

cobaltt7 · 2025-10-26T19:36:54Z

Looks good! I made a few small refactors because I realized it would make the code more concise. Now that CI is green, I'll go ahead and merge this.

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.9.1,>=25.9.0` -> `<25.11.1,>=25.11.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.9.0/25.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.11.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25110) [Compare Source](psf/black@25.9.0...25.11.0) ##### Highlights - Enable base 3.14 support ([#4804](psf/black#4804)) - Add support for the new Python 3.14 t-string syntax introduced by PEP 750 ([#4805](psf/black#4805)) ##### Stable style - Fix bug where comments between `# fmt: off` and `# fmt: on` were reformatted ([#4811](psf/black#4811)) - Comments containing fmt directives now preserve their exact formatting instead of being normalized ([#4811](psf/black#4811)) ##### Preview style - Move `multiline_string_handling` from `--unstable` to `--preview` ([#4760](psf/black#4760)) - Fix bug where module docstrings would be treated as normal strings if preceded by comments ([#4764](psf/black#4764)) - Fix bug where python 3.12 generics syntax split line happens weirdly ([#4777](psf/black#4777)) - Standardize type comments to form `# type: <value>` ([#4645](psf/black#4645)) - Fix `fix_fmt_skip_in_one_liners` preview feature to respect `# fmt: skip` for compound statements with semicolon-separated bodies ([#4800](psf/black#4800)) ##### Configuration - Add `no_cache` option to control caching behavior. ([#4803](psf/black#4803)) ##### Packaging - Releases now include arm64 Linux binaries ([#4773](psf/black#4773)) ##### Output - Write unchanged content to stdout when excluding formatting from stdin using pipes ([#4610](psf/black#4610)) ##### *Blackd* - Implemented BlackDClient. This simple python client allows to easily send formatting requests to blackd ([#4774](psf/black#4774)) ##### Integrations - Enable 3.14 base CI ([#4804](psf/black#4804)) - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only "stability" format when using pyproject.toml ([#4770](psf/black#4770)) - Improve error message for vim plugin users. It now handles independently vim version - Vim: Warn on unsupported Vim and Python versions independently ([#4772](psf/black#4772)) - Vim: Print the import paths when importing black fails ([#4675](psf/black#4675)) - Vim: Fix handling of virtualenvs that have a different Python version ([#4675](psf/black#4675)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/roboluke/pulls/393 Co-authored-by: renovate[bot] <[email protected]> Co-committed-by: renovate[bot] <[email protected]>

This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.9.1,>=25.9.0` -> `<25.11.1,>=25.11.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/black/25.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/black/25.9.0/25.11.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.11.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#25110) [Compare Source](psf/black@25.9.0...25.11.0) ##### Highlights - Enable base 3.14 support ([#4804](psf/black#4804)) - Add support for the new Python 3.14 t-string syntax introduced by PEP 750 ([#4805](psf/black#4805)) ##### Stable style - Fix bug where comments between `# fmt: off` and `# fmt: on` were reformatted ([#4811](psf/black#4811)) - Comments containing fmt directives now preserve their exact formatting instead of being normalized ([#4811](psf/black#4811)) ##### Preview style - Move `multiline_string_handling` from `--unstable` to `--preview` ([#4760](psf/black#4760)) - Fix bug where module docstrings would be treated as normal strings if preceded by comments ([#4764](psf/black#4764)) - Fix bug where python 3.12 generics syntax split line happens weirdly ([#4777](psf/black#4777)) - Standardize type comments to form `# type: <value>` ([#4645](psf/black#4645)) - Fix `fix_fmt_skip_in_one_liners` preview feature to respect `# fmt: skip` for compound statements with semicolon-separated bodies ([#4800](psf/black#4800)) ##### Configuration - Add `no_cache` option to control caching behavior. ([#4803](psf/black#4803)) ##### Packaging - Releases now include arm64 Linux binaries ([#4773](psf/black#4773)) ##### Output - Write unchanged content to stdout when excluding formatting from stdin using pipes ([#4610](psf/black#4610)) ##### *Blackd* - Implemented BlackDClient. This simple python client allows to easily send formatting requests to blackd ([#4774](psf/black#4774)) ##### Integrations - Enable 3.14 base CI ([#4804](psf/black#4804)) - Enhance GitHub Action `psf/black` to support the `required-version` major-version-only "stability" format when using pyproject.toml ([#4770](psf/black#4770)) - Improve error message for vim plugin users. It now handles independently vim version - Vim: Warn on unsupported Vim and Python versions independently ([#4772](psf/black#4772)) - Vim: Print the import paths when importing black fails ([#4675](psf/black#4675)) - Vim: Fix handling of virtualenvs that have a different Python version ([#4675](psf/black#4675)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.tainton.uk/repos/epage/pulls/176 Co-authored-by: renovate[bot] <[email protected]> Co-committed-by: renovate[bot] <[email protected]>

sonianuj287 force-pushed the fix_fmt_skip_in_one_liners branch 2 times, most recently from de9de36 to 2b11583 Compare October 18, 2025 18:31

sonianuj287 mentioned this pull request Oct 18, 2025

Preview style fix_fmt_skip_in_one_liners does not work for semi-colon separated statements in body of compound statement #4783

Closed

fix_fmt_skip_in_one_liners

4d06bfa

sonianuj287 force-pushed the fix_fmt_skip_in_one_liners branch from ea43a30 to 4d06bfa Compare October 18, 2025 18:37

sonianuj287 and others added 4 commits October 19, 2025 14:50

added testcase and changed changelog

3ae6d46

Merge branch 'main' into fix_fmt_skip_in_one_liners

aa9aebf

[pre-commit.ci] auto fixes from pre-commit.com hooks

48eb60e

for more information, see https://pre-commit.ci

Fix mypy type error in _find_compound_statement_context

c600eca

Add type assertion for simple_stmt nodes to ensure mypy compliance. The simple_stmt is always a Node, so this assertion is safe.

fixed tox and changelog CI issues

005a602

cobaltt7 reviewed Oct 19, 2025

View reviewed changes

resolved comments

5d6bfd7

sonianuj287 force-pushed the fix_fmt_skip_in_one_liners branch from cc689ed to 5d6bfd7 Compare October 20, 2025 05:35

Merge branch 'main' into fix_fmt_skip_in_one_liners

7816a7d

sonianuj287 requested a review from cobaltt7 October 20, 2025 05:35

pre-commit-ci bot and others added 2 commits October 20, 2025 05:36

[pre-commit.ci] auto fixes from pre-commit.com hooks

3c59c8f

for more information, see https://pre-commit.ci

Merge branch 'main' into fix_fmt_skip_in_one_liners

9cbac34

Merge branch 'main' into fix_fmt_skip_in_one_liners

d00cb60

cobaltt7 and others added 3 commits October 26, 2025 10:17

Run Black

16b26f7

Signed-off-by: cobalt <[email protected]>

Small refactors, I realized it's cleaner this way

ea9f088

Signed-off-by: cobalt <[email protected]>

Merge branch 'main' into fix_fmt_skip_in_one_liners

a08e439

cobaltt7 merged commit f735434 into psf:main Oct 26, 2025
55 checks passed

cobaltt7 mentioned this pull request Nov 29, 2025

Setting the 2026 stable style #4875

Open

fix_fmt_skip_in_one_liners #4800

fix_fmt_skip_in_one_liners #4800

Conversation

sonianuj287 commented Oct 18, 2025 • edited by cobaltt7 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist - did you ...

Uh oh!

sonianuj287 commented Oct 18, 2025

Uh oh!

cobaltt7 commented Oct 19, 2025

Uh oh!

github-actions bot commented Oct 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cobaltt7 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sonianuj287 commented Oct 21, 2025

Uh oh!

sonianuj287 commented Oct 23, 2025

Uh oh!

cobaltt7 commented Oct 24, 2025

Uh oh!

sonianuj287 commented Oct 26, 2025

Uh oh!

sonianuj287 commented Oct 26, 2025

Uh oh!

cobaltt7 commented Oct 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sonianuj287 commented Oct 18, 2025 •

edited by cobaltt7

Loading

github-actions bot commented Oct 19, 2025 •

edited

Loading

cobaltt7 commented Oct 26, 2025 •

edited

Loading