Merge pull request #776 from trantor/preview_fix

Fix preview map "leaking" with multiple variables

1 files changed, 8 insertions, 2 deletions

diff --git a/src/commands/preview/var.rs b/src/commands/preview/var.rs
index 8dd809b..14880bf 100644
--- a/src/commands/preview/var.rs
+++ b/src/commands/preview/var.rs
@@ -90,8 +90,14 @@ impl Runnable for Input {
                 "{variables}\n{variable} = {value}",
                 variables = variables,
                 variable = style(variable_name).with(variable_color),
-                value = finder::process(value, column, delimiter.as_deref(), map.clone())
-                    .expect("Unable to process value"),
+                value = if env_var::get(&env_variable_name).is_ok() {
+                    value
+                } else if is_current {
+                    finder::process(value, column, delimiter.as_deref(), map.clone())
+                            .expect("Unable to process value")
+                } else {
+                    "".to_string()
+                }
             );
         }