refactor: add correction indices argument to fix_{buffer,file_name} methods

Author: Bnyro

crates/typos-cli/src/file.rs

@@ -102,7 +102,7 @@ impl FileChecker for FixTypos {
                     }
                 }
                 if !fixes.is_empty() || path == std::path::Path::new("-") {
-                    let buffer = fix_buffer(buffer, fixes.into_iter());
+                    let buffer = fix_buffer(buffer, fixes, None);
                     write_file(path, content_type, buffer, reporter)?;
                 }
             }
@@ -127,11 +127,7 @@ impl FileChecker for FixTypos {
                     }
                 }
                 if !fixes.is_empty() {
-                    let file_name = file_name.to_owned().into_bytes();
-                    let new_name = fix_buffer(file_name, fixes.into_iter());
-                    let new_name =
-                        String::from_utf8(new_name).expect("corrections are valid utf-8");
-                    let new_path = path.with_file_name(new_name);
+                    let new_path = fix_file_name(path, file_name, fixes, None)?;
                     std::fs::rename(path, new_path)?;
                 }
             }
@@ -179,7 +175,7 @@ impl FileChecker for DiffTypos {
                     }
                 }
                 if !fixes.is_empty() {
-                    new_content = fix_buffer(buffer.clone(), fixes.into_iter());
+                    new_content = fix_buffer(buffer.clone(), fixes, None);
                     content = buffer;
                 }
             }
@@ -205,11 +201,7 @@ impl FileChecker for DiffTypos {
                     }
                 }
                 if !fixes.is_empty() {
-                    let file_name = file_name.to_owned().into_bytes();
-                    let new_name = fix_buffer(file_name, fixes.into_iter());
-                    let new_name =
-                        String::from_utf8(new_name).expect("corrections are valid utf-8");
-                    new_path = Some(path.with_file_name(new_name));
+                    new_path = fix_file_name(path, file_name, fixes, None).ok();
                 }
             }
         }
@@ -650,10 +642,24 @@ fn is_fixable(typo: &typos::Typo<'_>) -> bool {
     extract_fix(typo).is_some()
 }
 
-fn fix_buffer(mut buffer: Vec<u8>, typos: impl Iterator<Item = typos::Typo<'static>>) -> Vec<u8> {
+fn fix_buffer(
+    mut buffer: Vec<u8>,
+    typos: Vec<typos::Typo<'_>>,
+    correction_indices: Option<Vec<usize>>,
+) -> Vec<u8> {
     let mut offset = 0isize;
-    for typo in typos {
-        let fix = extract_fix(&typo).expect("Caller only provides fixable typos");
+    for typo_index in 0..typos.len() - 1 {
+        let typo = &typos[typo_index];
+        let correction_index = match &correction_indices {
+            Some(correction_indices) => correction_indices[typo_index],
+            None => 0,
+        };
+
+        let fix = match &typo.corrections {
+            typos::Status::Corrections(c) => Some(c[correction_index].as_ref()),
+            _ => None,
+        }
+        .expect("Caller provided invalid fix index");
         let start = ((typo.byte_offset as isize) + offset) as usize;
         let end = start + typo.typo.len();
 
@@ -664,6 +670,19 @@ fn fix_buffer(mut buffer: Vec<u8>, typos: impl Iterator<Item = typos::Typo<'stat
     buffer
 }
 
+fn fix_file_name<'a>(
+    path: &std::path::Path,
+    file_name: &'a str,
+    fixes: Vec<typos::Typo<'a>>,
+    correction_indices: Option<Vec<usize>>,
+) -> Result<std::path::PathBuf, std::io::Error> {
+    let file_name = file_name.to_owned().into_bytes();
+    let new_name = fix_buffer(file_name, fixes, correction_indices);
+    let new_name = String::from_utf8(new_name).expect("corrections are valid utf-8");
+    let new_path = path.with_file_name(new_name);
+    Ok(new_path)
+}
+
 pub fn walk_path(
     walk: ignore::Walk,
     checks: &dyn FileChecker,
@@ -777,8 +796,9 @@ mod test {
                 byte_offset,
                 typo: typo.into(),
                 corrections: typos::Status::Corrections(vec![correction.into()]),
-            });
-        let actual = fix_buffer(line, corrections);
+            })
+            .collect();
+        let actual = fix_buffer(line, corrections, None);
         String::from_utf8(actual).unwrap()
     }