pyupgrade: tighten diagnostic range for UP024 tuples (#19696

Author: Jkhall81

crates/ruff_linter/src/rules/pyupgrade/rules/os_error_alias.rs

@@ -93,7 +93,11 @@ fn atom_diagnostic(checker: &Checker, target: &Expr) {
 
 /// Create a [`Diagnostic`] for a tuple of expressions.
 fn tuple_diagnostic(checker: &Checker, tuple: &ast::ExprTuple, aliases: &[&Expr]) {
-    let mut diagnostic = checker.report_diagnostic(OSErrorAlias { name: None }, tuple.range());
+    let Some(first_alias) = aliases.first() else {
+        return;
+    };
+    let mut diagnostic =
+        checker.report_diagnostic(OSErrorAlias { name: None }, first_alias.range());
     let semantic = checker.semantic();
     if semantic.has_builtin_binding("OSError") {
         // Filter out any `OSErrors` aliases.

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_0.py.snap

@@ -135,12 +135,12 @@ help: Replace `error` with builtin `OSError`
 39 | # Should NOT be in parentheses when replaced
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_0.py:43:8
+  --> UP024_0.py:43:9
    |
 41 | try:
 42 |     pass
 43 | except (IOError,):
-   |        ^^^^^^^^^^
+   |         ^^^^^^^
 44 |     pass
 45 | try:
    |
@@ -155,12 +155,12 @@ help: Replace with builtin `OSError`
 46 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_0.py:47:8
+  --> UP024_0.py:47:9
    |
 45 | try:
 46 |     pass
 47 | except (mmap.error,):
-   |        ^^^^^^^^^^^^^
+   |         ^^^^^^^^^^
 48 |     pass
 49 | try:
    |
@@ -175,12 +175,12 @@ help: Replace with builtin `OSError`
 50 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_0.py:51:8
+  --> UP024_0.py:51:9
    |
 49 | try:
 50 |     pass
 51 | except (EnvironmentError, IOError, OSError, select.error):
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^
 52 |     pass
    |
 help: Replace with builtin `OSError`
@@ -194,12 +194,12 @@ help: Replace with builtin `OSError`
 54 | # Should be kept in parentheses (because multiple)
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_0.py:58:8
+  --> UP024_0.py:58:9
    |
 56 | try:
 57 |     pass
 58 | except (IOError, KeyError, OSError):
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^
 59 |     pass
    |
 help: Replace with builtin `OSError`
@@ -213,12 +213,12 @@ help: Replace with builtin `OSError`
 61 | # First should change, second should not
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_0.py:65:8
+  --> UP024_0.py:65:9
    |
 63 | try:
 64 |     pass
 65 | except (IOError, error):
-   |        ^^^^^^^^^^^^^^^^
+   |         ^^^^^^^
 66 |     pass
 67 | # These should not change
    |
@@ -252,12 +252,12 @@ help: Replace `mmap.error` with builtin `OSError`
 90 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
-   --> UP024_0.py:105:11
+   --> UP024_0.py:105:12
     |
 103 |     try:
 104 |         mac_address = get_primary_mac_address()
 105 |     except(IOError, OSError) as ex:
-    |           ^^^^^^^^^^^^^^^^^^
+    |            ^^^^^^^
 106 |         msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)
     |
 help: Replace with builtin `OSError`

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_1.py.snap

@@ -2,12 +2,12 @@
 source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
 ---
 UP024 [*] Replace aliased errors with `OSError`
- --> UP024_1.py:5:8
+ --> UP024_1.py:5:18
   |
 3 | try:
 4 |     pass
 5 | except (OSError, mmap.error, IOError):
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |                  ^^^^^^^^^^
 6 |     pass
 7 | except (OSError, socket.error, KeyError):
   |
@@ -22,12 +22,12 @@ help: Replace with builtin `OSError`
 8 |     pass
 
 UP024 [*] Replace aliased errors with `OSError`
- --> UP024_1.py:7:8
+ --> UP024_1.py:7:18
   |
 5 | except (OSError, mmap.error, IOError):
 6 |     pass
 7 | except (OSError, socket.error, KeyError):
-  |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |                  ^^^^^^^^^^^^
 8 |     pass
   |
 help: Replace with builtin `OSError`
@@ -41,18 +41,14 @@ help: Replace with builtin `OSError`
 10 | try:
 
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_1.py:12:8
+  --> UP024_1.py:14:5
    |
-10 |   try:
-11 |       pass
-12 |   except (
-   |  ________^
-13 | |     OSError,
-14 | |     select.error,
-15 | |     IOError,
-16 | | ):
-   | |_^
-17 |       pass
+12 | except (
+13 |     OSError,
+14 |     select.error,
+   |     ^^^^^^^^^^^^
+15 |     IOError,
+16 | ):
    |
 help: Replace with builtin `OSError`
 9  | 

crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linter__rules__pyupgrade__tests__UP024_4.py.snap

@@ -2,12 +2,12 @@
 source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
 ---
 UP024 [*] Replace aliased errors with `OSError`
-  --> UP024_4.py:9:8
+  --> UP024_4.py:9:9
    |
  7 |     conn.ensure_connection(max_retries=2)
  8 |     conn._close()
  9 | except (socket.error, exceptions.OperationalError):
-   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^
 10 |     return HttpResponseServerError("cache: cannot connect to broker.")
    |
 help: Replace with builtin `OSError`