Skip to content

Comments

Format PatternMatchSingleton#6741

Merged
MichaReiser merged 1 commit intoastral-sh:mainfrom
LaBatata101:format-pattern-match-singleton
Aug 22, 2023
Merged

Format PatternMatchSingleton#6741
MichaReiser merged 1 commit intoastral-sh:mainfrom
LaBatata101:format-pattern-match-singleton

Conversation

@LaBatata101
Copy link
Contributor

@LaBatata101 LaBatata101 commented Aug 21, 2023 •
edited
Loading

Summary

There's a case where a trailing comment ins't formatted like in Black. Consider the following code:

match x:
    case (
            None # trailing
            ):
        ...

Black formats to

match x:
    case (None):  # trailing
        ...

And Ruff will format to

match x:
    case (
        None  # trailing
    ):
        ...

Closes #6557

Test Plan

cargo test

@LaBatata101 LaBatata101 force-pushed the format-pattern-match-singleton branch from 71b142c to 1f5cb58 Compare August 21, 2023 21:21
@github-actions
Copy link
Contributor

github-actions bot commented Aug 21, 2023

PR Check Results

Benchmark

Linux

group                                      main                                   pr
-----                                      ----                                   --
formatter/large/dataset.py                 1.03      3.4±0.01ms    12.0 MB/sec    1.00      3.3±0.02ms    12.3 MB/sec
formatter/numpy/ctypeslib.py               1.04    714.0±3.24µs    23.3 MB/sec    1.00    689.6±2.05µs    24.1 MB/sec
formatter/numpy/globals.py                 1.06     77.3±0.38µs    38.2 MB/sec    1.00     72.9±1.18µs    40.5 MB/sec
formatter/pydantic/types.py                1.03  1388.9±15.02µs    18.4 MB/sec    1.00  1350.3±23.26µs    18.9 MB/sec
linter/all-rules/large/dataset.py          1.00     10.1±0.04ms     4.0 MB/sec    1.01     10.3±0.02ms     4.0 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      2.7±0.00ms     6.1 MB/sec    1.01      2.8±0.01ms     6.0 MB/sec
linter/all-rules/numpy/globals.py          1.00    390.4±1.00µs     7.6 MB/sec    1.01    395.2±0.84µs     7.5 MB/sec
linter/all-rules/pydantic/types.py         1.00      5.3±0.02ms     4.8 MB/sec    1.01      5.4±0.02ms     4.8 MB/sec
linter/default-rules/large/dataset.py      1.00      5.4±0.01ms     7.5 MB/sec    1.00      5.5±0.02ms     7.5 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00   1208.8±1.61µs    13.8 MB/sec    1.00   1209.5±5.59µs    13.8 MB/sec
linter/default-rules/numpy/globals.py      1.00    139.6±0.20µs    21.1 MB/sec    1.02    142.2±0.34µs    20.8 MB/sec
linter/default-rules/pydantic/types.py     1.00      2.5±0.00ms    10.3 MB/sec    1.00      2.5±0.00ms    10.3 MB/sec

Windows

group                                      main                                   pr
-----                                      ----                                   --
formatter/large/dataset.py                 1.00      2.9±0.03ms    14.2 MB/sec    1.00      2.9±0.03ms    14.2 MB/sec
formatter/numpy/ctypeslib.py               1.00    562.2±9.04µs    29.6 MB/sec    1.03    577.2±6.19µs    28.8 MB/sec
formatter/numpy/globals.py                 1.00     56.2±4.08µs    52.5 MB/sec    1.06     59.4±5.75µs    49.7 MB/sec
formatter/pydantic/types.py                1.00  1186.2±16.90µs    21.5 MB/sec    1.00  1187.7±27.54µs    21.5 MB/sec
linter/all-rules/large/dataset.py          1.00     10.0±0.04ms     4.1 MB/sec    1.02     10.2±0.07ms     4.0 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      2.7±0.01ms     6.1 MB/sec    1.02      2.8±0.01ms     6.0 MB/sec
linter/all-rules/numpy/globals.py          1.00    296.0±3.58µs    10.0 MB/sec    1.02    300.8±3.90µs     9.8 MB/sec
linter/all-rules/pydantic/types.py         1.00      5.1±0.03ms     5.0 MB/sec    1.02      5.2±0.04ms     4.9 MB/sec
linter/default-rules/large/dataset.py      1.00      5.6±0.02ms     7.3 MB/sec    1.01      5.6±0.03ms     7.3 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00  1137.1±10.58µs    14.6 MB/sec    1.00  1142.2±11.01µs    14.6 MB/sec
linter/default-rules/numpy/globals.py      1.00    119.7±0.88µs    24.7 MB/sec    1.03    123.1±2.45µs    24.0 MB/sec
linter/default-rules/pydantic/types.py     1.00      2.4±0.06ms    10.4 MB/sec    1.01      2.5±0.05ms    10.3 MB/sec

dhruvmanila
dhruvmanila approved these changes Aug 22, 2023
View reviewed changes
Copy link
Member

@dhruvmanila dhruvmanila left a comment

Choose a reason for hiding this comment

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

I think for the mentioned case we should handle it appropriately (see #6750). I wouldn't consider it as a blocker for this PR as the logic for the split is in the MatchCase formatting.

@MichaReiser MichaReiser added the formatter Related to the formatter label Aug 22, 2023
@MichaReiser MichaReiser merged commit 0f9ccfc into astral-sh:main Aug 22, 2023
@LaBatata101 LaBatata101 deleted the format-pattern-match-singleton branch August 25, 2023 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaReiser MichaReiser MichaReiser approved these changes

@dhruvmanila dhruvmanila dhruvmanila approved these changes

Assignees

No one assigned

Labels

formatter Related to the formatter

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Format PatternMatchSingleton

3 participants

@LaBatata101 @MichaReiser @dhruvmanila