fix: Properly calculate the max line num for suggestions

Author: Muscraft

src/renderer/render.rs

@@ -2699,21 +2699,26 @@ fn pre_process<'a>(
                         let display_suggestion = DisplaySuggestion::new(&complete, &patches, &sm);
 
                         if suggestion.fold {
-                            let end = suggestion
-                                .markers
-                                .iter()
-                                .map(|a| a.span.end)
-                                .max()
-                                .unwrap_or(suggestion.source.len())
-                                .min(suggestion.source.len());
-
-                            max_line_num = max(
-                                suggestion.line_start + newline_count(&suggestion.source[..end]),
-                                max_line_num,
-                            );
+                            if let Some(first) = patches.first() {
+                                let (l_start, _) =
+                                    sm.span_to_locations(first.original_span.clone());
+                                let nc = newline_count(&complete);
+                                let sugg_max_line_num = match display_suggestion {
+                                    DisplaySuggestion::Underline => l_start.line,
+                                    DisplaySuggestion::Diff => {
+                                        let file_lines = sm.span_to_lines(first.span.clone());
+                                        file_lines
+                                            .last()
+                                            .map_or(l_start.line + nc, |line| line.line_index)
+                                    }
+                                    DisplaySuggestion::None => l_start.line + nc,
+                                    DisplaySuggestion::Add => l_start.line + nc,
+                                };
+                                max_line_num = max(sugg_max_line_num, max_line_num);
+                            }
                         } else {
                             max_line_num = max(
-                                suggestion.line_start + newline_count(&suggestion.source),
+                                suggestion.line_start + newline_count(&complete),
                                 max_line_num,
                             );
                         }

tests/formatter.rs

@@ -4387,52 +4387,52 @@ fn main() {
 
     let expected_ascii = str![[r#"
 error[E0061]: this function takes 6 arguments but 5 arguments were supplied
-  --> $DIR/trimmed_multiline_suggestion.rs:5:5
-   |
- 5 |     function_with_lots_of_arguments(
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- 6 |         variable_name,
- 7 |         variable_name,
-   |         ------------- argument #2 of type `char` is missing
-   |
+ --> $DIR/trimmed_multiline_suggestion.rs:5:5
+  |
+5 |     function_with_lots_of_arguments(
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+6 |         variable_name,
+7 |         variable_name,
+  |         ------------- argument #2 of type `char` is missing
+  |
 note: function defined here
-  --> $DIR/trimmed_multiline_suggestion.rs:1:4
-   |
- 1 | fn function_with_lots_of_arguments(a: i32, b: char, c: i32, d: i32, e: i32, f: i32) {}
-   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^         -------
+ --> $DIR/trimmed_multiline_suggestion.rs:1:4
+  |
+1 | fn function_with_lots_of_arguments(a: i32, b: char, c: i32, d: i32, e: i32, f: i32) {}
+  |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^         -------
 help: provide the argument
-   |
- 5 |     function_with_lots_of_arguments(
- 6 |         variable_name,
- 7 ~         /* char */,
- 8 ~         variable_name,
-   |
+  |
+5 |     function_with_lots_of_arguments(
+6 |         variable_name,
+7 ~         /* char */,
+8 ~         variable_name,
+  |
 "#]];
     let renderer_ascii = Renderer::plain();
     assert_data_eq!(renderer_ascii.render(input), expected_ascii);
 
     let expected_unicode = str![[r#"
 error[E0061]: this function takes 6 arguments but 5 arguments were supplied
-   ╭▸ $DIR/trimmed_multiline_suggestion.rs:5:5
-   │
- 5 │     function_with_lots_of_arguments(
-   │     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- 6 │         variable_name,
- 7 │         variable_name,
-   │         ───────────── argument #2 of type `char` is missing
-   ╰╴
+  ╭▸ $DIR/trimmed_multiline_suggestion.rs:5:5
+  │
+5 │     function_with_lots_of_arguments(
+  │     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+6 │         variable_name,
+7 │         variable_name,
+  │         ───────────── argument #2 of type `char` is missing
+  ╰╴
 note: function defined here
-   ╭▸ $DIR/trimmed_multiline_suggestion.rs:1:4
-   │
- 1 │ fn function_with_lots_of_arguments(a: i32, b: char, c: i32, d: i32, e: i32, f: i32) {}
-   ╰╴   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━         ───────
+  ╭▸ $DIR/trimmed_multiline_suggestion.rs:1:4
+  │
+1 │ fn function_with_lots_of_arguments(a: i32, b: char, c: i32, d: i32, e: i32, f: i32) {}
+  ╰╴   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━         ───────
 help: provide the argument
-   ╭╴
- 5 │     function_with_lots_of_arguments(
- 6 │         variable_name,
- 7 ±         /* char */,
- 8 ±         variable_name,
-   ╰╴
+  ╭╴
+5 │     function_with_lots_of_arguments(
+6 │         variable_name,
+7 ±         /* char */,
+8 ±         variable_name,
+  ╰╴
 "#]];
     let renderer_unicode = renderer_ascii.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer_unicode.render(input), expected_unicode);
@@ -4590,54 +4590,54 @@ fn suggestion_no_fold() {
 
     let expected_ascii = str![[r#"
 error[E0061]: this function takes 6 arguments but 5 arguments were supplied
- --> $DIR/trimmed_multiline_suggestion.rs:3:5
-  |
-3 |     function_with_lots_of_arguments(
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 |         variable_name,
-5 |         variable_name,
-  |         ------------- argument #2 of type `char` is missing
-  |
+  --> $DIR/trimmed_multiline_suggestion.rs:3:5
+   |
+ 3 |     function_with_lots_of_arguments(
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 4 |         variable_name,
+ 5 |         variable_name,
+   |         ------------- argument #2 of type `char` is missing
+   |
 help: provide the argument
-  |
-1 | fn main() {
-2 |     let variable_name = 42;
-3 |     function_with_lots_of_arguments(
-4 |         variable_name,
-5 ~         /* char */,
-6 ~         variable_name,
-7 |         variable_name,
-8 |         variable_name,
-9 |     );
-10| }
-  |
+   |
+ 1 | fn main() {
+ 2 |     let variable_name = 42;
+ 3 |     function_with_lots_of_arguments(
+ 4 |         variable_name,
+ 5 ~         /* char */,
+ 6 ~         variable_name,
+ 7 |         variable_name,
+ 8 |         variable_name,
+ 9 |     );
+10 | }
+   |
 "#]];
     let renderer_ascii = Renderer::plain();
     assert_data_eq!(renderer_ascii.render(input), expected_ascii);
 
     let expected_unicode = str![[r#"
 error[E0061]: this function takes 6 arguments but 5 arguments were supplied
-  ╭▸ $DIR/trimmed_multiline_suggestion.rs:3:5
-  │
-3 │     function_with_lots_of_arguments(
-  │     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-4 │         variable_name,
-5 │         variable_name,
-  │         ───────────── argument #2 of type `char` is missing
-  ╰╴
+   ╭▸ $DIR/trimmed_multiline_suggestion.rs:3:5
+   │
+ 3 │     function_with_lots_of_arguments(
+   │     ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ 4 │         variable_name,
+ 5 │         variable_name,
+   │         ───────────── argument #2 of type `char` is missing
+   ╰╴
 help: provide the argument
-  ╭╴
-1 │ fn main() {
-2 │     let variable_name = 42;
-3 │     function_with_lots_of_arguments(
-4 │         variable_name,
-5 ±         /* char */,
-6 ±         variable_name,
-7 │         variable_name,
-8 │         variable_name,
-9 │     );
-10│ }
-  ╰╴
+   ╭╴
+ 1 │ fn main() {
+ 2 │     let variable_name = 42;
+ 3 │     function_with_lots_of_arguments(
+ 4 │         variable_name,
+ 5 ±         /* char */,
+ 6 ±         variable_name,
+ 7 │         variable_name,
+ 8 │         variable_name,
+ 9 │     );
+10 │ }
+   ╰╴
 "#]];
     let renderer_unicode = renderer_ascii.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer_unicode.render(input), expected_unicode);