use inclusive range and consider pure insertions

Author: 2bndy5

cpp-linter/src/clang_tools/clang_format.rs

@@ -3,7 +3,7 @@
 
 use std::{
     fs,
-    ops::Range,
+    ops::RangeInclusive,
     path::PathBuf,
     process::Command,
     sync::{Arc, Mutex, MutexGuard},
@@ -19,7 +19,7 @@ use crate::{cli::ClangParams, common_fs::FileObj, error::ClangCaptureError};
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct FormatAdvice {
     /// A list of [`Replacement`]s that clang-tidy wants to make.
-    pub replacements: Vec<Range<u32>>,
+    pub replacements: Vec<RangeInclusive<u32>>,
 
     pub patched: PathBuf,
 }
@@ -142,15 +142,19 @@ pub fn run_clang_format(
         replacements: diff
             .hunks()
             .filter_map(|hunk| {
+                let replacement = if hunk.is_pure_insertion() {
+                    RangeInclusive::new(hunk.after.start, hunk.after.end.saturating_sub(1))
+                } else {
+                    RangeInclusive::new(hunk.before.start, hunk.before.end.saturating_sub(1))
+                };
                 if ranges.is_empty() {
-                    Some(hunk.before)
+                    Some(replacement)
                 } else {
                     // only include replacements that fall within the specified line ranges
                     if ranges.iter().any(|range| {
-                        range.contains(&hunk.before.start)
-                            && range.contains(&hunk.before.end.saturating_sub(1))
+                        range.contains(replacement.start()) && range.contains(replacement.end())
                     }) {
-                        Some(hunk.before)
+                        Some(replacement)
                     } else {
                         None
                     }

cpp-linter/src/rest_client/mod.rs

@@ -223,7 +223,7 @@ impl RestClient {
                 // assemble a list of line numbers
                 let mut lines = Vec::new();
                 for replacement in &format_advice.replacements {
-                    for i in replacement.start..replacement.end {
+                    for i in replacement.clone() {
                         if !lines.contains(&i) {
                             lines.push(i);
                         }
@@ -360,7 +360,7 @@ fn make_format_comment(
             let line_count = format_advice
                 .replacements
                 .iter()
-                .fold(0, |acc, r| acc + r.len());
+                .fold(0, |acc, r| acc + r.clone().count());
             let note = format!(
                 "- {} ({line_count} line{})\n",
                 file.name.to_string_lossy().replace('\\', "/"),
@@ -488,7 +488,7 @@ mod test {
                 });
                 file.format_advice = Some(FormatAdvice {
                     #[allow(clippy::single_range_in_vec_init)]
-                    replacements: vec![1..2],
+                    replacements: vec![1..=2],
                     patched: PathBuf::new(),
                 });
                 files.push(Arc::new(Mutex::new(file)));