Filter empty lines, comments and delimiters from previous to last multiline span rendering

Author: estebank

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 {

src/tools/clippy/tests/ui-toml/arbitrary_source_item_ordering/ordering_mixed.default.stderr

@@ -20,7 +20,6 @@ LL | |     fn clone_self(&self) -> Self {
 LL | |         Self {
 LL | |             a: true,
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |
@@ -32,7 +31,6 @@ LL | |     fn default() -> Self {
 LL | |         Self {
 LL | |             a: true,
 ...  |
-LL | |     }
 LL | | }
    | |_^
 

src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr

@@ -286,7 +286,6 @@ LL | |         if unsafe { true } {
 LL | |             todo!();
 LL | |         } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |

src/tools/clippy/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr

@@ -294,7 +294,6 @@ LL | |         if unsafe { true } {
 LL | |             todo!();
 LL | |         } else {
 ...  |
-LL | |         }
 LL | |     };
    | |______^
    |

src/tools/clippy/tests/ui/bind_instead_of_map_multipart.stderr

@@ -44,7 +44,6 @@ LL | |         if {
 LL | |             if s == "43" {
 LL | |                 return Some(43);
 ...  |
-LL | |         }
 LL | |     });
    | |______^
    |

src/tools/clippy/tests/ui/collapsible_else_if.stderr

@@ -44,7 +44,6 @@ LL |       } else {
 LL | |         if y == "world" {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -66,7 +65,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -88,7 +86,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -110,7 +107,6 @@ LL |       } else {
 LL | |         if x == "hello" {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |
@@ -132,7 +128,6 @@ LL |       } else {
 LL | |         if let Some(42) = Some(42) {
 LL | |             println!("world")
 ...  |
-LL | |         }
 LL | |     }
    | |_____^
    |

src/tools/clippy/tests/ui/copy_iterator.stderr

@@ -6,7 +6,6 @@ LL | |
 LL | |
 LL | |     type Item = u8;
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |

src/tools/clippy/tests/ui/crashes/ice-360.stderr

@@ -3,7 +3,6 @@ error: this loop never actually loops
    |
 LL | /     loop {
 ...  |
-LL | |
 LL | |     }
    | |_____^
    |
@@ -14,7 +13,6 @@ error: this loop could be written as a `while let` loop
    |
 LL | /     loop {
 ...  |
-LL | |
 LL | |     }
    | |_____^ help: try: `while let Some(ele) = iter.next() { .. }`
    |

src/tools/clippy/tests/ui/derivable_impls.stderr

@@ -6,7 +6,6 @@ LL | |     fn default() -> Self {
 LL | |         Self {
 LL | |             a: false,
 ...  |
-LL | |     }
 LL | | }
    | |_^
    |

src/tools/clippy/tests/ui/empty_line_after/doc_comments.stderr

@@ -97,7 +97,6 @@ error: empty lines after doc comment
    |
 LL | /     /// for OldA
 ...  |
-LL | |     // struct OldB;
 LL | |
    | |_^
 ...