feat: include content in match results

crates/cli/src/analyze.rs

@@ -70,9 +70,9 @@ pub fn extract_rewritten_content(result: &MatchResult) -> Option<&String> {
         MatchResult::AnalysisLog(_) => None,
         MatchResult::Match(_) => None,
         MatchResult::InputFile(_) => None,
-        MatchResult::CreateFile(c) => Some(&c.rewritten.content),
+        MatchResult::CreateFile(c) => c.rewritten.content.as_ref(),
         MatchResult::RemoveFile(_) => None,
-        MatchResult::Rewrite(r) => Some(&r.rewritten.content),
+        MatchResult::Rewrite(r) => r.rewritten.content.as_ref(),
         MatchResult::DoneFile(_) => None,
         MatchResult::AllDone(_) => None,
         MatchResult::PatternInfo(_) => None,

crates/cli/src/result_formatting.rs

@@ -2,7 +2,6 @@ use anyhow::anyhow;
 use colored::Colorize;
 use console::style;
 use core::fmt;
-use fs_err::read_to_string;
 use log::{debug, error, info, warn};
 use marzano_core::api::{
     AllDone, AnalysisLog, AnalysisLogLevel, CreateFile, DoneFile, FileMatchResult, InputFile,
@@ -168,7 +167,7 @@ impl fmt::Display for FormattedResult {
             FormattedResult::Match(m) => {
                 let path_title = m.file_name().bold();
                 writeln!(f, "{}", path_title)?;
-                let source = read_to_string(m.file_name());
+                let source = m.content();
                 match source {
                     Err(e) => {
                         writeln!(f, "Could not read file: {}", e)?;
@@ -401,18 +400,18 @@ impl Messager for TransformedMessenger<'_> {
                 // Write the file contents to the output
                 if let Some(writer) = &mut self.writer {
                     let mut writer = writer.lock().map_err(|_| anyhow!("Output lock poisoned"))?;
-                    writeln!(writer, "{}", file.rewritten.content)?;
+                    writeln!(writer, "{}", file.content().unwrap_or_default())?;
                 } else {
-                    info!("{}", file.rewritten.content);
+                    info!("{}", file.content().unwrap_or_default());
                 }
             }
             MatchResult::CreateFile(file) => {
                 // Write the file contents to the output
                 if let Some(writer) = &mut self.writer {
                     let mut writer = writer.lock().map_err(|_| anyhow!("Output lock poisoned"))?;
-                    writeln!(writer, "{}", file.rewritten.content)?;
+                    writeln!(writer, "{}", file.content().unwrap_or_default())?;
                 } else {
-                    info!("{}", file.rewritten.content);
+                    info!("{}", file.content().unwrap_or_default());
                 }
             }
             MatchResult::RemoveFile(file) => {

crates/cli/src/ux.rs

@@ -8,10 +8,10 @@ use marzano_core::{
     fs::extract_ranges,
 };
 use marzano_gritmodule::{
-    config::ResolvedGritDefinition, testing::SampleTestResult, utils::extract_path,
+    config::ResolvedGritDefinition, testing::SampleTestResult,
 };
 use similar::{ChangeTag, TextDiff};
-use std::{collections::HashMap, fs::read_to_string};
+use std::{collections::HashMap};
 
 use crate::analyze::{extract_rewritten_content, group_checks};
 
@@ -149,20 +149,10 @@ fn format_diff(expected: &str, actual: &str) -> DiffString {
     DiffString { diff: output }
 }
 
-pub fn extract_original_content(r: &MatchResult) -> Option<String> {
-    match extract_path(r) {
-        Some(p) => match read_to_string(p) {
-            Ok(c) => Some(c),
-            Err(_) => None,
-        },
-        None => None,
-    }
-}
-
 pub fn format_result_diff(r: &MatchResult, src: Option<&str>) -> DiffString {
     let old_content = match src {
         Some(s) => s.to_string(),
-        None => extract_original_content(r).unwrap_or_default(),
+        None => r.extract_original_content().unwrap_or_default().to_string(),
     };
     let default_rewritten = String::new();
     let new_content = match extract_rewritten_content(r) {