fix(linter): shorten span of promise/prefer-await-to-then (#10717)

camc314 · camc314 · commit d8d8f64f64b5 · 2025-04-30T11:47:40.000Z
closes #8672
diff --git a/crates/oxc_linter/src/rules/promise/prefer_await_to_then.rs b/crates/oxc_linter/src/rules/promise/prefer_await_to_then.rs
@@ -93,7 +93,12 @@ impl Rule for PreferAwaitToThen {
             }
         }
 
-        ctx.diagnostic(prefer_wait_to_then_diagnostic(call_expr.span));
+        let span = call_expr
+            .callee
+            .as_member_expression()
+            .and_then(oxc_ast::ast::MemberExpression::static_property_info)
+            .map_or(call_expr.span, |(span, _)| span);
+        ctx.diagnostic(prefer_wait_to_then_diagnostic(span));
     }
 }
 
diff --git a/crates/oxc_linter/src/snapshots/promise_prefer_await_to_then.snap b/crates/oxc_linter/src/snapshots/promise_prefer_await_to_then.snap
@@ -2,79 +2,79 @@
 source: crates/oxc_linter/src/tester.rs
 ---
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:22]
  1 │ function foo() { hey.then(x => {}) }
-   ·                  ─────────────────
+   ·                      ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:43]
  1 │ function foo() { hey.then(function() { }).then() }
-   ·                  ───────────────────────────────
+   ·                                           ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:22]
  1 │ function foo() { hey.then(function() { }).then() }
-   ·                  ────────────────────────
+   ·                      ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:51]
  1 │ function foo() { hey.then(function() { }).then(x).catch() }
-   ·                  ────────────────────────────────────────
+   ·                                                   ─────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:43]
  1 │ function foo() { hey.then(function() { }).then(x).catch() }
-   ·                  ────────────────────────────────
+   ·                                           ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:22]
  1 │ function foo() { hey.then(function() { }).then(x).catch() }
-   ·                  ────────────────────────
+   ·                      ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:22]
+   ╭─[prefer_await_to_then.tsx:1:47]
  1 │ async function a() { hey.then(function() { }).then(function() { }) }
-   ·                      ─────────────────────────────────────────────
+   ·                                               ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:22]
+   ╭─[prefer_await_to_then.tsx:1:26]
  1 │ async function a() { hey.then(function() { }).then(function() { }) }
-   ·                      ────────────────────────
+   ·                          ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:22]
  1 │ function foo() { hey.catch(x => {}) }
-   ·                  ──────────────────
+   ·                      ─────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:18]
+   ╭─[prefer_await_to_then.tsx:1:22]
  1 │ function foo() { hey.finally(x => {}) }
-   ·                  ────────────────────
+   ·                      ───────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:1]
+   ╭─[prefer_await_to_then.tsx:1:13]
  1 │ something().then(async () => await somethingElse())
-   · ───────────────────────────────────────────────────
+   ·             ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:30]
+   ╭─[prefer_await_to_then.tsx:1:38]
  1 │ async function foo() { await thing().then() }
-   ·                              ──────────────
+   ·                                      ────
    ╰────
 
   ⚠ eslint-plugin-promise(prefer-await-to-then): Prefer await to then()/catch()/finally()
-   ╭─[prefer_await_to_then.tsx:1:24]
+   ╭─[prefer_await_to_then.tsx:1:32]
  1 │ async function foo() { thing().then() }
-   ·                        ──────────────
+   ·                                ────
    ╰────

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,12 @@ impl Rule for PreferAwaitToThen {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- ctx.diagnostic(prefer_wait_to_then_diagnostic(call_expr.span));`
	`96`	`+ let span = call_expr`
	`97`	`+ .callee`
	`98`	`+ .as_member_expression()`
	`99`	`+ .and_then(oxc_ast::ast::MemberExpression::static_property_info)`
	`100`	`+ .map_or(call_expr.span, \|(span, _)\| span);`
	`101`	`+ ctx.diagnostic(prefer_wait_to_then_diagnostic(span));`
`97`	`102`	`}`
`98`	`103`	`}`
`99`	`104`