Refactor nu-cli/env* (#3041)

* Revert "History, more test coverage improvements, and refactorings. (#3217)"

This reverts commit 8fc8fc89aa.

* Add tests

* Refactor .nu-env

* Change logic of Config write to logic of read()

* Fix reload always appends to old vars

* Fix reload always takes last_modified of global config

* Add reload_config in evaluation context

* Reload config after writing to it in cfg set / cfg set_into

* Add --no-history to cli options

* Use --no-history in tests

* Add comment about maybe_print_errors

* Get ctrl_exit var from context.global_config

* Use context.global_config in command "config"

* Add Readme in engine how env vars are now handled

* Update docs from autoenv command

* Move history_path from engine to nu_data

* Move load history out of if

* No let before return

* Add import for indexmap

crates/nu-command/src/commands/config/command.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 use nu_engine::CommandArgs;
 use nu_engine::WholeStreamCommand;
 use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
+use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
 use nu_stream::OutputStream;
 
 pub struct Command;
@@ -22,20 +22,21 @@ impl WholeStreamCommand for Command {
     }
 
     async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let name = args.call_info.name_tag.clone();
+        let name = args.call_info.name_tag;
 
-        let path = match args.scope.get_var("config-path") {
-            Some(Value {
-                value: UntaggedValue::Primitive(Primitive::FilePath(path)),
-                ..
-            }) => Some(path),
-            _ => nu_data::config::default_path().ok(),
-        };
-        let result = nu_data::config::read(&name, &path)?;
-
-        Ok(futures::stream::iter(vec![ReturnSuccess::value(
-            UntaggedValue::Row(result.into()).into_value(name),
-        )])
-        .to_output_stream())
+        if let Some(global_cfg) = &args.configs.lock().global_config {
+            let result = global_cfg.vars.clone();
+            Ok(futures::stream::iter(vec![ReturnSuccess::value(
+                UntaggedValue::Row(result.into()).into_value(name),
+            )])
+            .to_output_stream())
+        } else {
+            Ok(
+                futures::stream::iter(vec![ReturnSuccess::value(UntaggedValue::Error(
+                    ShellError::untagged_runtime_error("No global config found!"),
+                ))])
+                .to_output_stream(),
+            )
+        }
     }
 }

crates/nu-command/src/commands/config/set.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 use nu_engine::WholeStreamCommand;
 use nu_errors::ShellError;
 use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
+    ColumnPath, ConfigPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
 };
 
 pub struct SubCommand;
@@ -61,6 +61,7 @@ impl WholeStreamCommand for SubCommand {
 
 pub async fn set(args: CommandArgs) -> Result<OutputStream, ShellError> {
     let name = args.call_info.name_tag.clone();
+    let ctx = EvaluationContext::from_args(&args);
     let scope = args.scope.clone();
     let (
         Arguments {
@@ -93,6 +94,10 @@ pub async fn set(args: CommandArgs) -> Result<OutputStream, ShellError> {
             ..
         }) => {
             config::write(&changes.entries, &path)?;
+            ctx.reload_config(&ConfigPath::Global(
+                path.expect("Global config path is always some"),
+            ))
+            .await?;
 
             Ok(OutputStream::one(ReturnSuccess::value(
                 UntaggedValue::Row(changes).into_value(name),

crates/nu-command/src/commands/config/set_into.rs

@@ -1,7 +1,9 @@
 use crate::prelude::*;
 use nu_engine::WholeStreamCommand;
 use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
+use nu_protocol::{
+    ConfigPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
+};
 use nu_source::Tagged;
 
 pub struct SubCommand;
@@ -44,6 +46,7 @@ impl WholeStreamCommand for SubCommand {
 
 pub async fn set_into(args: CommandArgs) -> Result<OutputStream, ShellError> {
     let name = args.call_info.name_tag.clone();
+    let ctx = EvaluationContext::from_args(&args);
     let scope = args.scope.clone();
     let (Arguments { set_into: v }, input) = args.process().await?;
 
@@ -73,6 +76,10 @@ pub async fn set_into(args: CommandArgs) -> Result<OutputStream, ShellError> {
         result.insert(key, value.clone());
 
         config::write(&result, &path)?;
+        ctx.reload_config(&ConfigPath::Global(
+            path.expect("Global config path is always some"),
+        ))
+        .await?;
 
         OutputStream::one(ReturnSuccess::value(
             UntaggedValue::Row(result.into()).into_value(name),
@@ -84,6 +91,10 @@ pub async fn set_into(args: CommandArgs) -> Result<OutputStream, ShellError> {
         result.insert(key, value);
 
         config::write(&result, &path)?;
+        ctx.reload_config(&ConfigPath::Global(
+            path.expect("Global config path is always some"),
+        ))
+        .await?;
 
         OutputStream::one(ReturnSuccess::value(
             UntaggedValue::Row(result.into()).into_value(name),