Improve diff ranges and context merging

Author: haasonsaas

src/core/context.rs

@@ -41,18 +41,24 @@ impl ContextFetcher {
         if full_path.exists() {
             let content = tokio::fs::read_to_string(&full_path).await?;
             let file_lines: Vec<&str> = content.lines().collect();
+            let merged_ranges = merge_ranges(lines);
 
-            for (start, end) in lines {
+            for (start, end) in merged_ranges {
+                if file_lines.is_empty() {
+                    break;
+                }
+                let start = start.max(1);
+                let end = end.max(start);
                 let start_idx = start.saturating_sub(1);
-                let end_idx = (*end).min(file_lines.len());
+                let end_idx = end.min(file_lines.len());
 
                 if start_idx < file_lines.len() {
                     let chunk_content = file_lines[start_idx..end_idx].join("\n");
                     chunks.push(LLMContextChunk {
                         file_path: file_path.clone(),
                         content: chunk_content,
                         context_type: ContextType::FileContent,
-                        line_range: Some((*start, *end)),
+                        line_range: Some((start, end)),
                     });
                 }
             }
@@ -164,3 +170,26 @@ impl ContextFetcher {
         Ok(chunks)
     }
 }
+
+fn merge_ranges(lines: &[(usize, usize)]) -> Vec<(usize, usize)> {
+    if lines.is_empty() {
+        return Vec::new();
+    }
+
+    let mut ranges = lines.to_vec();
+    ranges.sort_by_key(|(start, _)| *start);
+
+    let mut merged: Vec<(usize, usize)> = Vec::new();
+    for (start, end) in ranges {
+        let end = end.max(start);
+        if let Some(last) = merged.last_mut() {
+            if start <= last.1.saturating_add(1) {
+                last.1 = last.1.max(end);
+                continue;
+            }
+        }
+        merged.push((start, end));
+    }
+
+    merged
+}

src/main.rs

@@ -288,7 +288,7 @@ async fn review_command(
                 &diff
                     .hunks
                     .iter()
-                    .map(|h| (h.new_start, h.new_start + h.new_lines))
+                    .map(|h| (h.new_start, h.new_start + h.new_lines.saturating_sub(1)))
                     .collect::<Vec<_>>(),
             )
             .await?;
@@ -801,7 +801,7 @@ async fn review_diff_content_raw(
                 &diff
                     .hunks
                     .iter()
-                    .map(|h| (h.new_start, h.new_start + h.new_lines))
+                    .map(|h| (h.new_start, h.new_start + h.new_lines.saturating_sub(1)))
                     .collect::<Vec<_>>(),
             )
             .await?;
@@ -1232,7 +1232,7 @@ async fn smart_review_command(
                 &diff
                     .hunks
                     .iter()
-                    .map(|h| (h.new_start, h.new_start + h.new_lines))
+                    .map(|h| (h.new_start, h.new_start + h.new_lines.saturating_sub(1)))
                     .collect::<Vec<_>>(),
             )
             .await?;