refactor: Return Option from splice_lines

Author: Muscraft

src/renderer/render.rs

@@ -1454,7 +1454,7 @@ fn emit_suggestion_default(
 
     let buffer_offset = buffer.num_lines();
     let mut row_num = buffer_offset + usize::from(!matches_previous_suggestion);
-    for (complete, parts, highlights) in &suggestions {
+    if let Some((complete, parts, highlights)) = suggestions {
         let has_deletion = parts
             .iter()
             .any(|p| p.is_deletion(sm) || p.is_destructive_replacement(sm));
@@ -1636,7 +1636,7 @@ fn emit_suggestion_default(
                 renderer,
                 buffer,
                 &mut row_num,
-                highlight_parts,
+                &highlight_parts,
                 line_pos + line_start.line,
                 line,
                 show_code_change,
@@ -1850,7 +1850,6 @@ fn emit_suggestion_default(
             } else {
                 draw_col_separator_end(renderer, buffer, row, max_line_num_len + 1);
             }
-            row_num = row + 1;
         }
     }
 }

src/renderer/source_map.rs

@@ -371,11 +371,7 @@ impl<'a> SourceMap<'a> {
         &'b self,
         mut patches: Vec<Patch<'b>>,
         fold: bool,
-    ) -> Vec<(
-        String,
-        Vec<TrimmedPatch<'b>>,
-        Vec<Vec<SubstitutionHighlight>>,
-    )> {
+    ) -> Option<SplicedLines<'b>> {
         fn push_trailing(
             buf: &mut String,
             line_opt: Option<&str>,
@@ -432,12 +428,8 @@ impl<'a> SourceMap<'a> {
 
         // Find the bounding span.
         let (lo, hi) = if fold {
-            let Some(lo) = patches.iter().map(|p| p.span.start).min() else {
-                return Vec::new();
-            };
-            let Some(hi) = patches.iter().map(|p| p.span.end).max() else {
-                return Vec::new();
-            };
+            let lo = patches.iter().map(|p| p.span.start).min()?;
+            let hi = patches.iter().map(|p| p.span.end).max()?;
             (lo, hi)
         } else {
             (0, source_len)
@@ -561,9 +553,9 @@ impl<'a> SourceMap<'a> {
             buf.pop();
         }
         if highlights.iter().all(|parts| parts.is_empty()) {
-            Vec::new()
+            None
         } else {
-            vec![(buf, trimmed_patches, highlights)]
+            Some((buf, trimmed_patches, highlights))
         }
     }
 }
@@ -720,6 +712,12 @@ impl<'a> Iterator for CursorLines<'a> {
     }
 }
 
+pub(crate) type SplicedLines<'a> = (
+    String,
+    Vec<TrimmedPatch<'a>>,
+    Vec<Vec<SubstitutionHighlight>>,
+);
+
 /// Used to translate between `Span`s and byte positions within a single output line in highlighted
 /// code of structured suggestions.
 #[derive(Debug, Clone, Copy)]