Load experimental options before command context is loaded (nushell#16690)

Author: cptpiepmatz

crates/nu-cmd-lang/src/default_context.rs

@@ -2,8 +2,11 @@ use crate::*;
 use nu_protocol::engine::{EngineState, StateWorkingSet};
 
 pub fn create_default_context() -> EngineState {
-    let mut engine_state = EngineState::new();
+    let engine_state = EngineState::new();
+    add_default_context(engine_state)
+}
 
+pub fn add_default_context(mut engine_state: EngineState) -> EngineState {
     let delta = {
         let mut working_set = StateWorkingSet::new(&engine_state);
 

src/command_context.rs

@@ -1,7 +1,7 @@
 use nu_protocol::engine::EngineState;
 
-pub(crate) fn get_engine_state() -> EngineState {
-    let engine_state = nu_cmd_lang::create_default_context();
+pub(crate) fn add_command_context(engine_state: EngineState) -> EngineState {
+    let engine_state = nu_cmd_lang::add_default_context(engine_state);
     #[cfg(feature = "plugin")]
     let engine_state = nu_cmd_plugin::add_plugin_command_context(engine_state);
     let engine_state = nu_command::add_shell_command_context(engine_state);
@@ -27,7 +27,7 @@ mod tests {
             }
         }
 
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -77,7 +77,7 @@ mod tests {
             }
         }
 
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -108,7 +108,7 @@ mod tests {
 
     #[test]
     fn signature_name_matches_command_name() {
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -134,7 +134,7 @@ mod tests {
 
     #[test]
     fn commands_declare_input_output_types() {
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -164,7 +164,7 @@ mod tests {
 
     #[test]
     fn no_search_term_duplicates() {
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -190,7 +190,7 @@ mod tests {
 
     #[test]
     fn description_end_period() {
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 
@@ -213,7 +213,7 @@ mod tests {
 
     #[test]
     fn description_start_uppercase() {
-        let ctx = get_engine_state();
+        let ctx = add_command_context(EngineState::new());
         let decls = ctx.get_decls_sorted(true);
         let mut failures = Vec::new();
 

src/main.rs

@@ -24,7 +24,8 @@ use nu_lsp::LanguageServer;
 use nu_path::canonicalize_with;
 use nu_protocol::{
     ByteStream, Config, IntoValue, PipelineData, ShellError, Span, Spanned, Type, Value,
-    engine::Stack, record, report_shell_error,
+    engine::{EngineState, Stack},
+    record, report_shell_error,
 };
 use nu_std::load_standard_library;
 use nu_utils::perf;
@@ -63,7 +64,20 @@ fn main() -> Result<()> {
         miette_hook(x);
     }));
 
-    let mut engine_state = command_context::get_engine_state();
+    let mut engine_state = EngineState::new();
+
+    // Parse commandline args very early and load experimental options to allow loading different
+    // commands based on experimental options.
+    let (args_to_nushell, script_name, args_to_script) = gather_commandline_args();
+    let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
+        .unwrap_or_else(|err| {
+            report_shell_error(&engine_state, &err);
+            std::process::exit(1)
+        });
+
+    experimental_options::load(&engine_state, &parsed_nu_cli_args, !script_name.is_empty());
+
+    let mut engine_state = command_context::add_command_context(engine_state);
 
     // Provide `version` the features of this nu binary
     let cargo_features = env!("NU_FEATURES").split(",").map(Cow::Borrowed).collect();
@@ -195,15 +209,6 @@ fn main() -> Result<()> {
     #[cfg(feature = "sqlite")]
     db.last_insert_rowid();
 
-    let (args_to_nushell, script_name, args_to_script) = gather_commandline_args();
-    let parsed_nu_cli_args = parse_commandline_args(&args_to_nushell.join(" "), &mut engine_state)
-        .unwrap_or_else(|err| {
-            report_shell_error(&engine_state, &err);
-            std::process::exit(1)
-        });
-
-    experimental_options::load(&engine_state, &parsed_nu_cli_args, !script_name.is_empty());
-
     // keep this condition in sync with the branches at the end
     engine_state.is_interactive = parsed_nu_cli_args.interactive_shell.is_some()
         || (parsed_nu_cli_args.testbin.is_none()