post review comments

Author: 2bndy5

cpp-linter-lib/Cargo.toml

@@ -18,7 +18,7 @@ log = "0.4.22"
 openssl = { version = "0.10", features = ["vendored"], optional = true }
 openssl-probe = { version = "0.1", optional = true }
 regex = "1.10.6"
-reqwest = { version = "0.12.7", features = ["json"]}
+reqwest = "0.12.7"
 semver = "1.0.23"
 serde = { version = "1.0.209", features = ["derive"] }
 serde-xml-rs = "0.6.0"

cpp-linter-lib/src/clang_tools/clang_format.rs

@@ -3,16 +3,18 @@
 
 use std::{
     process::Command,
-    sync::{Arc, Mutex},
+    sync::{Arc, Mutex, MutexGuard},
 };
 
+use log::Level;
 // non-std crates
 use serde::Deserialize;
 use serde_xml_rs::de::Deserializer;
 
 // project-specific crates/modules
+use super::MakeSuggestions;
 use crate::{
-    cli::LinesChangedOnly,
+    cli::ClangParams,
     common_fs::{get_line_cols_from_offset, FileObj},
 };
 
@@ -23,6 +25,18 @@ pub struct FormatAdvice {
     /// A list of [`Replacement`]s that clang-tidy wants to make.
     #[serde(rename = "$value")]
     pub replacements: Vec<Replacement>,
+
+    pub patched: Option<Vec<u8>>,
+}
+
+impl MakeSuggestions for FormatAdvice {
+    fn get_suggestion_help(&self, _start_line: u32, _end_line: u32) -> String {
+        String::from("### clang-format suggestions\n")
+    }
+
+    fn get_tool_name(&self) -> String {
+        "clang-format".to_string()
+    }
 }
 
 /// A single replacement that clang-format wants to make.
@@ -79,24 +93,52 @@ pub fn tally_format_advice(files: &[Arc<Mutex<FileObj>>]) -> u64 {
 
 /// Run clang-tidy for a specific `file`, then parse and return it's XML output.
 pub fn run_clang_format(
-    cmd: &mut Command,
-    file: &mut Arc<Mutex<FileObj>>,
-    style: &str,
-    lines_changed_only: &LinesChangedOnly,
+    file: &mut MutexGuard<FileObj>,
+    clang_params: &ClangParams,
 ) -> Vec<(log::Level, String)> {
+    let mut cmd = Command::new(clang_params.clang_format_command.as_ref().unwrap());
     let mut logs = vec![];
-    let mut file = file.lock().unwrap();
-    cmd.args(["--style", style, "--output-replacements-xml"]);
-    let ranges = file.get_ranges(lines_changed_only);
+    cmd.args(["--style", &clang_params.style]);
+    let ranges = file.get_ranges(&clang_params.lines_changed_only);
     for range in &ranges {
         cmd.arg(format!("--lines={}:{}", range.start(), range.end()));
     }
     cmd.arg(file.name.to_string_lossy().as_ref());
+    let mut patched = None;
+    if clang_params.format_review {
+        logs.push((
+            Level::Info,
+            format!(
+                "Getting format fixes with \"{} {}\"",
+                clang_params
+                    .clang_format_command
+                    .as_ref()
+                    .unwrap()
+                    .to_str()
+                    .unwrap(),
+                cmd.get_args()
+                    .map(|a| a.to_str().unwrap())
+                    .collect::<Vec<&str>>()
+                    .join(" ")
+            ),
+        ));
+        patched = Some(
+            cmd.output()
+                .expect("Failed to get fixes from clang-format")
+                .stdout,
+        );
+    }
+    cmd.arg("--output-replacements-xml");
     logs.push((
         log::Level::Info,
         format!(
             "Running \"{} {}\"",
-            cmd.get_program().to_string_lossy(),
+            clang_params
+                .clang_format_command
+                .as_ref()
+                .unwrap()
+                .to_str()
+                .unwrap(),
             cmd.get_args()
                 .map(|x| x.to_str().unwrap())
                 .collect::<Vec<&str>>()
@@ -129,7 +171,9 @@ pub fn run_clang_format(
     let mut format_advice = FormatAdvice::deserialize(&mut Deserializer::new(event_reader))
         .unwrap_or(FormatAdvice {
             replacements: vec![],
+            patched: None,
         });
+    format_advice.patched = patched;
     if !format_advice.replacements.is_empty() {
         let mut filtered_replacements = Vec::new();
         for replacement in &mut format_advice.replacements {
@@ -201,6 +245,7 @@ mod tests {
                     cols: None,
                 },
             ],
+            patched: None,
         };
         let config = serde_xml_rs::ParserConfig::new()
             .trim_whitespace(false)