Avoid removing comment hash for noqa's with trailing content

[charliermarsh]

Summary

Right now, if you have a comment like # noqa bar, then when removing the blanket # noqa, we leave bar behind -- which is a syntax error.

It if the comment that trails the noqa is not itself a "partial comment" (like # noqa # bar), then we need to shift the deletion to exclude the #.

Closes #3586.

[github-actions]

PR Check Results

Ecosystem

ℹ️ ecosystem check detected changes. (+18, -0, 0 error(s))

airflow (+6, -0)

+ airflow/providers/google/cloud/operators/dataflow.py:1378:9: PLR1711 [*] Useless `return` statement at end of function
+ airflow/providers/microsoft/azure/sensors/data_factory.py:134:9: PLR1711 [*] Useless `return` statement at end of function
+ airflow/utils/db.py:1475:5: PLR1711 [*] Useless `return` statement at end of function
+ dev/check_files.py:223:5: PLR1711 [*] Useless `return` statement at end of function
+ dev/check_files.py:237:5: PLR1711 [*] Useless `return` statement at end of function
+ tests/jobs/test_scheduler_job.py:1924:17: PLR1711 [*] Useless `return` statement at end of function

bokeh (+10, -0)

+ src/bokeh/application/application.py:236:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/application/application.py:249:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/client/connection.py:281:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/contexts.py:301:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/contexts.py:321:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/tornado.py:715:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/views/ws.py:223:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/views/ws.py:262:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/views/ws.py:288:9: PLR1711 [*] Useless `return` statement at end of function
+ src/bokeh/server/views/ws.py:335:9: PLR1711 [*] Useless `return` statement at end of function

zulip (+2, -0)

+ zerver/lib/streams.py:243:5: PLR1711 [*] Useless `return` statement at end of function
+ zerver/lib/test_helpers.py:122:9: PLR1711 [*] Useless `return` statement at end of function

Benchmark

Linux

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     14.5±0.06ms     2.8 MB/sec    1.02     14.8±0.06ms     2.8 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      3.8±0.00ms     4.3 MB/sec    1.01      3.9±0.00ms     4.3 MB/sec
linter/all-rules/numpy/globals.py          1.00    446.1±1.65µs     6.6 MB/sec    1.01    452.5±2.66µs     6.5 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.4±0.01ms     4.0 MB/sec    1.02      6.6±0.01ms     3.9 MB/sec
linter/default-rules/large/dataset.py      1.00      8.1±0.02ms     5.0 MB/sec    1.04      8.4±0.02ms     4.8 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00   1756.2±2.61µs     9.5 MB/sec    1.03   1807.5±2.75µs     9.2 MB/sec
linter/default-rules/numpy/globals.py      1.00    184.7±0.82µs    16.0 MB/sec    1.03    189.5±0.29µs    15.6 MB/sec
linter/default-rules/pydantic/types.py     1.00      3.8±0.01ms     6.8 MB/sec    1.03      3.9±0.01ms     6.6 MB/sec

Windows

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     15.4±0.08ms     2.6 MB/sec    1.01     15.5±0.10ms     2.6 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      4.2±0.02ms     4.0 MB/sec    1.00      4.2±0.02ms     4.0 MB/sec
linter/all-rules/numpy/globals.py          1.00    462.8±4.61µs     6.4 MB/sec    1.00    463.6±4.65µs     6.4 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.8±0.02ms     3.7 MB/sec    1.01      6.9±0.07ms     3.7 MB/sec
linter/default-rules/large/dataset.py      1.00      8.7±0.08ms     4.7 MB/sec    1.00      8.7±0.04ms     4.7 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00  1861.0±20.85µs     8.9 MB/sec    1.00   1858.2±8.29µs     9.0 MB/sec
linter/default-rules/numpy/globals.py      1.00    191.5±1.01µs    15.4 MB/sec    1.01    194.0±2.37µs    15.2 MB/sec
linter/default-rules/pydantic/types.py     1.00      4.0±0.03ms     6.4 MB/sec    1.01      4.0±0.04ms     6.3 MB/sec

[charliermarsh]

Thanks for such a thorough review, I know this is a tricky area.