AI review changes

Author: 2bndy5

cpp-linter/src/cli/structs.rs

@@ -229,7 +229,7 @@ impl ClangParams {
     pub(crate) const CACHE_DIR: &str = ".cpp-linter-cache";
 
     /// The file name for aggregating auto-fixes into a unified patch.
-    pub(crate) const AUTO_FIX_PATCH: &str = "auto_fix.patch";
+    pub(crate) const AUTO_FIX_PATCH: &str = "auto-fix.patch";
 
     pub(crate) fn get_cache_path(&self) -> PathBuf {
         self.repo_root.join(Self::CACHE_DIR).join("patched")

cpp-linter/src/rest_client.rs

@@ -238,14 +238,14 @@ impl RestClient {
                 file.maybe_append_patch(&feedback_inputs.repo_root)?;
             }
         }
-        let auto_fix_patch_patch = feedback_inputs
+        let auto_fix_patch_path = feedback_inputs
             .repo_root
             .join(ClangParams::CACHE_DIR)
             .join(ClangParams::AUTO_FIX_PATCH);
-        if auto_fix_patch_patch.exists() {
+        if auto_fix_patch_path.exists() {
             self.client.write_output_variables(&[OutputVariable {
                 name: "fix-patch-path".to_string(),
-                value: auto_fix_patch_patch.to_string_lossy().replace("\\", "/"),
+                value: auto_fix_patch_path.to_string_lossy().replace("\\", "/"),
             }])?;
         }
         Ok(format_checks_failed + tidy_checks_failed)

cpp-linter/src/run.rs

@@ -157,6 +157,12 @@ pub async fn run_main(args: Vec<String>) -> Result<()> {
     let cache_dir = clang_params.repo_root.join(ClangParams::CACHE_DIR);
     std::fs::create_dir_all(&cache_dir)
         .with_context(|| "Failed to create a local cache directory.")?;
+    // delete old patch file
+    let patch_file = cache_dir.join(ClangParams::AUTO_FIX_PATCH);
+    if patch_file.exists() {
+        std::fs::remove_file(&patch_file)
+            .with_context(|| "Failed to remove old patch file from previous runs.")?;
+    }
     // add gitignore file in project cache dir
     std::fs::write(
         cache_dir.join(".gitignore"),
@@ -193,7 +199,7 @@ pub(crate) mod test {
     #![allow(clippy::unwrap_used)]
 
     use super::run_main;
-    use crate::test_common::setup_tmp_workspace;
+    use crate::{cli::ClangParams, test_common::setup_tmp_workspace};
     use std::env;
 
     /// helper to avoid writing to the same GITHUB_OUTPUT file in parallel-running tests.
@@ -238,6 +244,13 @@ pub(crate) mod test {
     async fn force_debug_output() {
         let tmp_gh_out = setup_tmp_gh_out_path();
         let tmp_workspace = setup_tmp_workspace();
+
+        // create a dummy patch file to ensure it is deleted (in code coverage).
+        let cache_dir = tmp_workspace.path().join(ClangParams::CACHE_DIR);
+        std::fs::create_dir_all(&cache_dir).unwrap();
+        let patch_path = cache_dir.join(ClangParams::AUTO_FIX_PATCH);
+        std::fs::write(&patch_path, "").unwrap();
+
         run_main(vec![
             "cpp-linter".to_string(),
             "-l".to_string(),

cpp-linter/tests/comments.rs

@@ -4,7 +4,7 @@ use cpp_linter::cli::ThreadComments;
 use cpp_linter::run::run_main;
 use git_bot_feedback::LinesChangedOnly;
 use mockito::Matcher;
-use std::{env, fmt::Display, io::Write, path::Path};
+use std::{env, fmt::Display, fs, io::Write, path::Path};
 use tempfile::{NamedTempFile, TempDir};
 
 mod common;
@@ -274,11 +274,25 @@ async fn setup(lib_root: &Path, tmp_dir: &TempDir, test_params: &TestParams) {
     for mock in mocks {
         mock.assert();
     }
-    let patch_path = tmp_dir
-        .path()
-        .join(".cpp-linter-cache")
-        .join("auto_fix.patch");
-    if patch_path.exists() {
+
+    // Read the GITHUB_OUTPUT file to check for the patch path
+    let output_vars = fs::read_to_string(tmp_out_file.path()).unwrap();
+    let patch_path_from_output = output_vars
+        .lines()
+        .find(|line| line.starts_with("fix-patch-path="))
+        .map(|line| {
+            line.trim_start_matches("fix-patch-path=")
+                .trim()
+                .to_string()
+        });
+    if let Some(patch_path_from_output) = patch_path_from_output {
+        // verify patch path exists and print its content
+        println!("Patch path from GITHUB_OUTPUT: {patch_path_from_output}");
+        let patch_path = Path::new(&patch_path_from_output);
+        assert!(
+            patch_path.exists(),
+            "Patch file does not exist at expected path."
+        );
         let patch_content =
             std::fs::read_to_string(patch_path).expect("Failed to read generated patch file.");
         println!("Generated patch content:\n{patch_content}");