Better report source line and col for multiline annotations (#2242)

Improves diagnostic report source line- and column-number for **multiline annotations** Requires #2241
oxc-project · Feb 1, 2024 · 6b2150f · 6b2150f
1 parent ba85b09
commit 6b2150f
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 87 deletions.
diff --git a/crates/oxc_diagnostics/src/graphic_reporter.rs b/crates/oxc_diagnostics/src/graphic_reporter.rs
@@ -405,7 +405,7 @@ impl GraphicalReportHandler {
             .find_map(|hl| {
                 lines
                     .iter()
-                    .find(|line| line.span_applies(hl) && line.span_line_only(hl))
+                    .find(|line| line.span_applies(hl))
                     .map(|line| (line.line_number, self.visual_offset(line, hl.offset()) + 1))
             })
             .unwrap_or_else(|| (contents.line() + 1, contents.column() + 1));

diff --git a/crates/oxc_linter/src/snapshots/array_callback_return.snap b/crates/oxc_linter/src/snapshots/array_callback_return.snap
@@ -743,14 +743,14 @@ expression: array_callback_return
   help: Array method "Array.from" needs to have valid return on all code paths
 
   ⚠ eslint(array-callback-return): Missing return on some path for array method "Array.prototype.filter"
-   ╭─[array_callback_return.tsx:1:1]
+   ╭─[array_callback_return.tsx:1:27]
  1 │ ╭─▶ foo.filter(function bar() { return 
  2 │ ╰─▶  })
    ╰────
   help: Array method "Array.prototype.filter" needs to have valid return on all code paths
 
   ⚠ eslint(array-callback-return): Unexpected return for array method Array.prototype.forEach
-   ╭─[array_callback_return.tsx:1:1]
+   ╭─[array_callback_return.tsx:1:25]
  1 │ ╭─▶ foo.forEach(function () { 
  2 │ │   if (baz) return bar
  3 │ │   else return

diff --git a/crates/oxc_linter/src/snapshots/ban_ts_comment.snap b/crates/oxc_linter/src/snapshots/ban_ts_comment.snap
@@ -16,7 +16,7 @@ expression: ban_ts_comment
    ╰────
 
   ⚠ Do not use @ts-expect-error because it alters compilation errors.
-   ╭─[ban_ts_comment.tsx:1:1]
+   ╭─[ban_ts_comment.tsx:2:3]
  1 │     
  2 │ ╭─▶ /*
  3 │ ╰─▶   @ts-expect-error
@@ -93,7 +93,7 @@ expression: ban_ts_comment
    ╰────
 
   ⚠ Do not use @ts-ignore because it alters compilation errors.
-   ╭─[ban_ts_comment.tsx:1:1]
+   ╭─[ban_ts_comment.tsx:2:3]
  1 │     
  2 │ ╭─▶ /*
  3 │ ╰─▶   @ts-ignore
@@ -170,7 +170,7 @@ expression: ban_ts_comment
    ╰────
 
   ⚠ Do not use @ts-nocheck because it alters compilation errors.
-   ╭─[ban_ts_comment.tsx:1:1]
+   ╭─[ban_ts_comment.tsx:2:3]
  1 │     
  2 │ ╭─▶ /*
  3 │ ╰─▶   @ts-nocheck
@@ -235,7 +235,7 @@ expression: ban_ts_comment
    ╰────
 
   ⚠ Do not use @ts-check because it alters compilation errors.
-   ╭─[ban_ts_comment.tsx:1:1]
+   ╭─[ban_ts_comment.tsx:2:3]
  1 │     
  2 │ ╭─▶ /*
  3 │ ╰─▶   @ts-check

diff --git a/crates/oxc_linter/src/snapshots/ban_types.snap b/crates/oxc_linter/src/snapshots/ban_types.snap
@@ -147,7 +147,7 @@ expression: ban_types
    ╰────
 
   ⚠ typescript-eslint(ban-types): Prefer explicitly define the object shape
-   ╭─[ban_types.tsx:1:1]
+   ╭─[ban_types.tsx:1:17]
  1 │ ╭─▶ const emptyObj: {
  2 │ │   
  3 │ ╰─▶         } = {foo: "bar"};