From 41834d16d683d03c81f7a2c2d266610e4425e846 Mon Sep 17 00:00:00 2001
From: JT <jonathandturner@users.noreply.github.com>
Date: Wed, 26 May 2021 17:58:32 +1200
Subject: [PATCH] Allow aliases to expand and ignore painting outside of lines
 (#3492)

---
 crates/nu-engine/src/from_value.rs        |  4 ++++
 crates/nu-engine/src/shell/painter.rs     |  4 +++-
 tests/shell/pipeline/commands/internal.rs | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/crates/nu-engine/src/from_value.rs b/crates/nu-engine/src/from_value.rs
index 396ebc4f70..9341eb8974 100644
--- a/crates/nu-engine/src/from_value.rs
+++ b/crates/nu-engine/src/from_value.rs
@@ -374,6 +374,10 @@ impl FromValue for Vec<Value> {
                 value: UntaggedValue::Table(t),
                 ..
             } => Ok(t.clone()),
+            Value {
+                value: UntaggedValue::Row(_),
+                ..
+            } => Ok(vec![v.clone()]),
             Value { tag, .. } => Err(ShellError::labeled_error(
                 "Can't convert to table",
                 "can't convert to table",
diff --git a/crates/nu-engine/src/shell/painter.rs b/crates/nu-engine/src/shell/painter.rs
index a43f386879..89f98088d5 100644
--- a/crates/nu-engine/src/shell/painter.rs
+++ b/crates/nu-engine/src/shell/painter.rs
@@ -46,7 +46,9 @@ impl Painter {
 
     fn paint(&mut self, styled_span: &Spanned<Style>) {
         for pos in styled_span.span.start()..styled_span.span.end() {
-            self.styles[pos] = styled_span.item;
+            if pos < self.styles.len() {
+                self.styles[pos] = styled_span.item;
+            }
         }
     }
 
diff --git a/tests/shell/pipeline/commands/internal.rs b/tests/shell/pipeline/commands/internal.rs
index 197b8cdc0c..dfc8a022ed 100644
--- a/tests/shell/pipeline/commands/internal.rs
+++ b/tests/shell/pipeline/commands/internal.rs
@@ -306,6 +306,18 @@ fn run_custom_command_with_empty_rest() {
     assert_eq!(actual.err, r#""#);
 }
 
+#[test]
+fn alias_a_load_env() {
+    let actual = nu!(
+        cwd: ".",
+        r#"
+            def activate-helper [] { [[name, value]; [BOB, SAM]] }; alias activate = load-env (activate-helper); activate; $nu.env.BOB
+        "#
+    );
+
+    assert_eq!(actual.out, r#"SAM"#);
+}
+
 #[test]
 fn let_variable() {
     let actual = nu!(