custom command format

.vscode/settings.json

@@ -2,4 +2,7 @@
   "editor.formatOnSave": true,
   "rust-analyzer.check.command": "clippy",
   "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+  "[svg]": {
+    "editor.formatOnSave": false,
+  },
 }

Cargo.toml

@@ -37,7 +37,6 @@ derive_more = { version = "1.0.0-beta.6", features = [
 deunicode = "1.4.2"
 itoap = "1.0.1"
 memchr = "2.7.1"
-regex = "1.10.4"
 terminal_size = "0.3.0"
 unicode-width = "0.1.11"
 which = "6.0.0"

docs/reference/rew.md

@@ -1,6 +1,7 @@
 # rew
 
-The Swiss Army Knife of line-oriented text processing. Transform text by composing parallel shell pipelines!
+The Swiss Army Knife of line-oriented text processing.
+Transform text by composing parallel shell pipelines!
 
 ## Usage
 

src/commands/x.rs

@@ -364,7 +364,7 @@ struct EvalContext {
 impl EvalContext {
     fn from_command(command: &Command) -> Self {
         Self {
-            raw_command: Some(format_command(command)),
+            raw_command: Some(format_command(command).unwrap_or_else(|_| format!("{command:?}"))),
             raw_expr: None,
         }
     }
@@ -399,24 +399,35 @@ impl EvalContext {
     }
 }
 
-#[cfg(not(debug_assertions))]
-fn format_command(command: &Command) -> String {
-    format!("{command:?}")
-}
+fn format_command(command: &Command) -> Result<String> {
+    use std::fmt::Write;
+    let mut output = String::new();
 
-#[cfg(debug_assertions)]
-fn format_command(command: &Command) -> String {
-    let output = format!("{command:?}");
+    for (key, val) in command.get_envs() {
+        let key = key.to_string_lossy();
+        let val = val.unwrap_or_default();
+        write!(&mut output, "{key}={val:?} ",)?;
+    }
 
+    // We want to obfuscate program path to make "transcript" tests reproducible.
+    #[cfg(debug_assertions)]
     if env::var_os("NEXTEST").is_some() {
-        // We want to obfuscate fs paths to make "transcript" tests reproducible.
-        let separator = std::path::MAIN_SEPARATOR_STR.replace('\\', "\\\\");
-        let pattern = format!("[^\"]*{separator}",);
-        let regex = regex::Regex::new(&pattern).unwrap();
-        regex.replace(&output, "<masked_path>/").to_string()
+        let program = std::path::Path::new(command.get_program())
+            .file_stem()
+            .unwrap_or_default();
+        write!(&mut output, "{program:?}")?;
     } else {
-        output
+        write!(&mut output, "{:?}", command.get_program())?;
+    }
+
+    #[cfg(not(debug_assertions))]
+    write!(&mut output, "{:?}", command.get_program())?;
+
+    for arg in command.get_args() {
+        write!(&mut output, " {arg:?}")?;
     }
+
+    Ok(output)
 }
 
 trait WithEvalContext<T> {