Add autofix for `PLR1701` (repeated-isinstance-calls) #4792

dhruvmanila · 2023-06-01T18:23:28Z

Summary

Add auto-fix for PLR1701 (repeated-isinstance-calls)

Test Plan

Updated existing snapshot with cargo test & cargo insta review
Added new snapshot for Python version 3.9

resolves: #4768

dhruvmanila · 2023-06-01T18:33:58Z

crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs

+    if target_version >= PythonVersion::Py310 {
+        format!("isinstance({}, {})", obj, types.into_iter().join(" | "))
+    } else {
+        format!("isinstance({}, ({}))", obj, types.into_iter().join(", "))


Should we use the AST to build this or is it fine to format it directly?

I think either would be reasonable.

github-actions · 2023-06-01T18:55:18Z

PR Check Results

Ecosystem

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

airflow (+2, -2)

- airflow/utils/dot_renderer.py:122:8: PLR1701 Merge these isinstance calls: `isinstance(node, (BaseOperator, MappedOperator))`
+ airflow/utils/dot_renderer.py:122:8: PLR1701 [*] Merge `isinstance` calls: `isinstance(node, (BaseOperator, MappedOperator))`
- airflow/www/views.py:4236:14: PLR1701 Merge these isinstance calls: `isinstance(items, (DagRun, TaskInstance))`
+ airflow/www/views.py:4236:14: PLR1701 [*] Merge `isinstance` calls: `isinstance(items, (DagRun, TaskInstance))`

Rules changed: 1

Rule	Changes	Additions	Removals
PLR1701	4	2	2

Benchmark

Linux

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     15.1±0.08ms     2.7 MB/sec    1.00     15.1±0.09ms     2.7 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.00      3.7±0.00ms     4.5 MB/sec    1.00      3.6±0.01ms     4.6 MB/sec
linter/all-rules/numpy/globals.py          1.02    381.3±0.94µs     7.7 MB/sec    1.00    374.8±0.97µs     7.9 MB/sec
linter/all-rules/pydantic/types.py         1.00      6.3±0.01ms     4.0 MB/sec    1.00      6.3±0.02ms     4.1 MB/sec
linter/default-rules/large/dataset.py      1.00      7.6±0.02ms     5.4 MB/sec    1.00      7.6±0.07ms     5.4 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00   1614.6±5.90µs    10.3 MB/sec    1.00   1610.2±6.19µs    10.3 MB/sec
linter/default-rules/numpy/globals.py      1.01    177.9±0.32µs    16.6 MB/sec    1.00    176.2±0.56µs    16.7 MB/sec
linter/default-rules/pydantic/types.py     1.01      3.5±0.02ms     7.4 MB/sec    1.00      3.4±0.01ms     7.5 MB/sec
parser/large/dataset.py                    1.00      5.8±0.00ms     7.1 MB/sec    1.01      5.8±0.01ms     7.0 MB/sec
parser/numpy/ctypeslib.py                  1.00   1124.5±2.50µs    14.8 MB/sec    1.01   1134.3±1.56µs    14.7 MB/sec
parser/numpy/globals.py                    1.00    116.0±0.34µs    25.4 MB/sec    1.01    116.7±0.64µs    25.3 MB/sec
parser/pydantic/types.py                   1.00      2.5±0.00ms    10.4 MB/sec    1.01      2.5±0.00ms    10.3 MB/sec

Windows

group                                      main                                   pr
-----                                      ----                                   --
linter/all-rules/large/dataset.py          1.00     16.9±0.12ms     2.4 MB/sec    1.00     16.9±0.16ms     2.4 MB/sec
linter/all-rules/numpy/ctypeslib.py        1.01      4.4±0.04ms     3.8 MB/sec    1.00      4.3±0.01ms     3.8 MB/sec
linter/all-rules/numpy/globals.py          1.00    449.7±4.49µs     6.6 MB/sec    1.01   454.4±11.61µs     6.5 MB/sec
linter/all-rules/pydantic/types.py         1.00      7.2±0.07ms     3.5 MB/sec    1.01      7.3±0.13ms     3.5 MB/sec
linter/default-rules/large/dataset.py      1.00      8.5±0.07ms     4.8 MB/sec    1.01      8.6±0.17ms     4.7 MB/sec
linter/default-rules/numpy/ctypeslib.py    1.00  1790.8±16.72µs     9.3 MB/sec    1.26      2.3±0.43ms     7.4 MB/sec
linter/default-rules/numpy/globals.py      1.00    195.8±2.65µs    15.1 MB/sec    1.02    200.4±5.49µs    14.7 MB/sec
linter/default-rules/pydantic/types.py     1.00      3.9±0.02ms     6.6 MB/sec    1.03      4.0±0.38ms     6.4 MB/sec
parser/large/dataset.py                    1.00      6.6±0.03ms     6.1 MB/sec    1.20      8.0±0.02ms     5.1 MB/sec
parser/numpy/ctypeslib.py                  1.00  1256.3±20.72µs    13.3 MB/sec    1.17  1465.3±10.05µs    11.4 MB/sec
parser/numpy/globals.py                    1.00    131.1±1.04µs    22.5 MB/sec    1.12    146.3±0.90µs    20.2 MB/sec
parser/pydantic/types.py                   1.00      2.8±0.02ms     9.1 MB/sec    1.18      3.3±0.02ms     7.7 MB/sec

dhruvmanila · 2023-06-02T02:25:41Z

crates/ruff/src/rules/pylint/rules/repeated_isinstance_calls.rs

+        if !checker.semantic_model().is_builtin("isinstance") {
+            return;
+        }


@charliermarsh I'm unable to understand why was this moved here 😅

Instead of checking once, this will check for each iteration but I don't think the semantic model changes. Am I missing something here?

It effectively delays the check until we have at least one isinstance call. The result should be the same, since we're returning, but we avoid having to do the is_builtin check if none of the calls are isinstance.

Oh right, understood. Thanks!

Add autofix for PLR1701 (repeated-isinstance-calls)

08940d4

dhruvmanila commented Jun 1, 2023

View reviewed changes

charliermarsh added 4 commits June 1, 2023 16:15

Merge branch 'main' into feat/PLR1701/autofix

a04d78b

Tweak message

eca159f

Move around

546775b

Late isinstance check

043914a

charliermarsh enabled auto-merge (squash) June 1, 2023 20:34

charliermarsh merged commit 0099f97 into astral-sh:main Jun 1, 2023

dhruvmanila commented Jun 2, 2023

View reviewed changes

dhruvmanila deleted the feat/PLR1701/autofix branch June 2, 2023 02:27

chenrui333 mentioned this pull request Jun 6, 2023

ruff 0.0.272 Homebrew/homebrew-core#133013

Merged

konstin pushed a commit that referenced this pull request Jun 13, 2023

Add autofix for PLR1701 (repeated-isinstance-calls) (#4792)

f83ae56

Skylion007 mentioned this pull request Oct 22, 2023

repeated-isinstance-calls is a duplicate rule of duplicate-isinstance-call #8122

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add autofix for `PLR1701` (repeated-isinstance-calls) #4792

Add autofix for `PLR1701` (repeated-isinstance-calls) #4792

dhruvmanila commented Jun 1, 2023

dhruvmanila Jun 1, 2023

charliermarsh Jun 1, 2023

github-actions bot commented Jun 1, 2023 •

edited

Loading

dhruvmanila Jun 2, 2023

charliermarsh Jun 2, 2023

dhruvmanila Jun 2, 2023

Add autofix for PLR1701 (repeated-isinstance-calls) #4792

Add autofix for PLR1701 (repeated-isinstance-calls) #4792

Conversation

dhruvmanila commented Jun 1, 2023

Summary

Test Plan

dhruvmanila Jun 1, 2023

Choose a reason for hiding this comment

charliermarsh Jun 1, 2023

Choose a reason for hiding this comment

github-actions bot commented Jun 1, 2023 • edited Loading

PR Check Results

Ecosystem

Benchmark

Linux

Windows

dhruvmanila Jun 2, 2023

Choose a reason for hiding this comment

charliermarsh Jun 2, 2023

Choose a reason for hiding this comment

dhruvmanila Jun 2, 2023

Choose a reason for hiding this comment

Add autofix for `PLR1701` (repeated-isinstance-calls) #4792

Add autofix for `PLR1701` (repeated-isinstance-calls) #4792

github-actions bot commented Jun 1, 2023 •

edited

Loading