From 49a22a4245bd6dfd3646a6658e0f90a2ab0657ad Mon Sep 17 00:00:00 2001 From: Esteban Küber Date: Wed, 11 Dec 2024 21:48:33 +0000 Subject: Filter empty lines, comments and delimiters from previous to last multiline span rendering --- compiler/rustc_errors/src/emitter.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'compiler/rustc_errors') diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs index 9595790d574..04b18b92a0c 100644 --- a/compiler/rustc_errors/src/emitter.rs +++ b/compiler/rustc_errors/src/emitter.rs @@ -3064,7 +3064,11 @@ impl FileWithAnnotatedLines { add_annotation_to_file(&mut output, Lrc::clone(&file), line, ann.as_line()); } let line_end = ann.line_end - 1; - if middle < line_end { + let end_is_empty = file.get_line(line_end - 1).map_or(false, |s| { + let s = s.trim(); + ["", "{", "}", "(", ")", "[", "]"].contains(&s) || s.starts_with("//") + }); + if middle < line_end && !end_is_empty { add_annotation_to_file(&mut output, Lrc::clone(&file), line_end, ann.as_line()); } } else { -- cgit 1.4.1-3-g733a5